@twin.org/blob-storage-service 0.0.1-next.23 → 0.0.1-next.25

package/dist/cjs/index.cjs

@@ -681,7 +681,7 @@ class BlobStorageService {
                 }
             }
             const jsonLd = this.entryToJsonLd(blobEntry, returnBlob);
-            return dataJsonLd.JsonLdProcessor.compact(jsonLd);
+            return dataJsonLd.JsonLdProcessor.compact(jsonLd, jsonLd["@context"]);
         }
         catch (error) {
             throw new core.GeneralError(this.CLASS_NAME, "getFailed", undefined, error);
@@ -824,18 +824,24 @@ class BlobStorageService {
             core.ObjectHelper.propertyDelete(entity, "nodeIdentity");
             core.ObjectHelper.propertyDelete(entity, "userIdentity");
         }
+        let context = [
+            blobStorageModels.BlobStorageTypes.ContextRoot,
+            blobStorageModels.BlobStorageTypes.ContextRootCommon,
+            standardsSchemaOrg.SchemaOrgTypes.ContextRoot
+        ];
+        const entriesJsonLd = [];
+        for (const entry of result.entities) {
+            // The entries are never Partial as we don't allow custom property requests.
+            entriesJsonLd.push(this.entryToJsonLd(entry));
+            context = dataJsonLd.JsonLdProcessor.combineContexts(context, entry.annotationObject?.["@context"]);
+        }
         const jsonLd = {
-            "@context": [
-                blobStorageModels.BlobStorageTypes.ContextRoot,
-                blobStorageModels.BlobStorageTypes.ContextRootCommon,
-                standardsSchemaOrg.SchemaOrgTypes.ContextRoot
-            ],
+            "@context": context,
             type: blobStorageModels.BlobStorageTypes.EntryList,
-            // The entries are never Partial as we don't allow custom property requests.
-            entries: result.entities.map(entry => this.entryToJsonLd(entry)),
+            entries: entriesJsonLd,
             cursor: result.cursor
         };
-        return dataJsonLd.JsonLdProcessor.compact(jsonLd);
+        return dataJsonLd.JsonLdProcessor.compact(jsonLd, jsonLd["@context"]);
     }
     /**
      * Get the connector from the uri.
@@ -913,12 +919,12 @@ class BlobStorageService {
      * @internal
      */
     entryToJsonLd(entry, blob) {
-        return {
-            "@context": [
+        const jsonLd = {
+            "@context": dataJsonLd.JsonLdProcessor.combineContexts([
                 blobStorageModels.BlobStorageTypes.ContextRoot,
                 blobStorageModels.BlobStorageTypes.ContextRootCommon,
                 standardsSchemaOrg.SchemaOrgTypes.ContextRoot
-            ],
+            ], entry?.annotationObject?.["@context"]),
             id: entry.id,
             type: blobStorageModels.BlobStorageTypes.Entry,
             dateCreated: entry.dateCreated,
@@ -930,6 +936,7 @@ class BlobStorageService {
             annotationObject: entry?.annotationObject,
             blob: core.Is.uint8Array(blob) ? core.Converter.bytesToBase64(blob) : undefined
         };
+        return jsonLd;
     }
 }
 

package/dist/esm/index.mjs

@@ -679,7 +679,7 @@ class BlobStorageService {
                 }
             }
             const jsonLd = this.entryToJsonLd(blobEntry, returnBlob);
-            return JsonLdProcessor.compact(jsonLd);
+            return JsonLdProcessor.compact(jsonLd, jsonLd["@context"]);
         }
         catch (error) {
             throw new GeneralError(this.CLASS_NAME, "getFailed", undefined, error);
@@ -822,18 +822,24 @@ class BlobStorageService {
             ObjectHelper.propertyDelete(entity, "nodeIdentity");
             ObjectHelper.propertyDelete(entity, "userIdentity");
         }
+        let context = [
+            BlobStorageTypes.ContextRoot,
+            BlobStorageTypes.ContextRootCommon,
+            SchemaOrgTypes.ContextRoot
+        ];
+        const entriesJsonLd = [];
+        for (const entry of result.entities) {
+            // The entries are never Partial as we don't allow custom property requests.
+            entriesJsonLd.push(this.entryToJsonLd(entry));
+            context = JsonLdProcessor.combineContexts(context, entry.annotationObject?.["@context"]);
+        }
         const jsonLd = {
-            "@context": [
-                BlobStorageTypes.ContextRoot,
-                BlobStorageTypes.ContextRootCommon,
-                SchemaOrgTypes.ContextRoot
-            ],
+            "@context": context,
             type: BlobStorageTypes.EntryList,
-            // The entries are never Partial as we don't allow custom property requests.
-            entries: result.entities.map(entry => this.entryToJsonLd(entry)),
+            entries: entriesJsonLd,
             cursor: result.cursor
         };
-        return JsonLdProcessor.compact(jsonLd);
+        return JsonLdProcessor.compact(jsonLd, jsonLd["@context"]);
     }
     /**
      * Get the connector from the uri.
@@ -911,12 +917,12 @@ class BlobStorageService {
      * @internal
      */
     entryToJsonLd(entry, blob) {
-        return {
-            "@context": [
+        const jsonLd = {
+            "@context": JsonLdProcessor.combineContexts([
                 BlobStorageTypes.ContextRoot,
                 BlobStorageTypes.ContextRootCommon,
                 SchemaOrgTypes.ContextRoot
-            ],
+            ], entry?.annotationObject?.["@context"]),
             id: entry.id,
             type: BlobStorageTypes.Entry,
             dateCreated: entry.dateCreated,
@@ -928,6 +934,7 @@ class BlobStorageService {
             annotationObject: entry?.annotationObject,
             blob: Is.uint8Array(blob) ? Converter.bytesToBase64(blob) : undefined
         };
+        return jsonLd;
     }
 }
 

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/blob-storage-service - Changelog
 
-## v0.0.1-next.23
+## v0.0.1-next.25
 
 - Initial Release

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/blob-storage-service",
-	"version": "0.0.1-next.23",
+	"version": "0.0.1-next.25",
 	"description": "Blob storage contract implementation and REST endpoint definitions",
 	"repository": {
 		"type": "git",
@@ -15,7 +15,7 @@
 	},
 	"dependencies": {
 		"@twin.org/api-models": "next",
-		"@twin.org/blob-storage-models": "0.0.1-next.23",
+		"@twin.org/blob-storage-models": "0.0.1-next.25",
 		"@twin.org/core": "next",
 		"@twin.org/crypto": "next",
 		"@twin.org/data-json-ld": "next",