@startinblox/core 0.18.0-beta.1 → 0.18.0-beta.2

package/dist/libs/store/store.js

@@ -50,6 +50,7 @@ class Store {
     this.subscriptionVirtualContainersIndex = new Map();
     this.loadingList = new Set();
     this.headers = {
+      'Accept': 'application/ld+json',
       'Content-Type': 'application/ld+json',
       'Cache-Control': 'must-revalidate'
     };
@@ -236,7 +237,10 @@ class Store {
       credentials: 'include'
     });
     const resourceProxy = store.get(id);
-    const clientContext = resourceProxy ? resourceProxy.clientContext : resource['@context'];
+    const clientContext = resourceProxy ? {
+      ...resourceProxy.clientContext,
+      ...resource['@context']
+    } : resource['@context'];
     this.clearCache(id);
     await this.getData(id, clientContext, '', resource);
     return {
@@ -548,8 +552,7 @@ _Symbol$toPrimitive = Symbol.toPrimitive;
 class CustomGetter {
   // search attributes to give to server
 
-  constructor(resourceId, resource, clientContext) {
-    let serverContext = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  constructor(resourceId, resource, clientContext, serverContext) {
     let parentId = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "";
     let serverPagination = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
     let serverSearch = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
@@ -613,7 +616,10 @@ class CustomGetter {
     let value;
     if (!this.isFullResource()) {
       // if resource is not complete, fetch it first
-      await this.getResource(this.resourceId, this.clientContext, this.parentId);
+      await this.getResource(this.resourceId, {
+        ...this.clientContext,
+        ...this.serverContext
+      }, this.parentId);
     }
     while (true) {
       try {
@@ -628,11 +634,17 @@ class CustomGetter {
     if (path2.length === 0) {
       // end of the path
       if (!value || !value['@id']) return value; // no value or not a resource
-      return await this.getResource(value['@id'], this.clientContext, this.parentId || this.resourceId); // return complete resource
+      return await this.getResource(value['@id'], {
+        ...this.clientContext,
+        ...this.serverContext
+      }, this.parentId || this.resourceId); // return complete resource
     }
 
     if (!value) return undefined;
-    let resource = await this.getResource(value['@id'], this.clientContext, this.parentId || this.resourceId);
+    let resource = await this.getResource(value['@id'], {
+      ...this.clientContext,
+      ...this.serverContext
+    }, this.parentId || this.resourceId);
     store.subscribeResourceTo(this.resourceId, value['@id']);
     return resource ? await resource[path2.join('.')] : undefined; // return value
   }
@@ -720,7 +732,10 @@ class CustomGetter {
     let permissions = this.resource[permissionPredicate];
     if (!permissions) {
       // if no permission, re-fetch data
-      await this.getResource(this.resourceId, this.clientContext, this.parentId, true);
+      await this.getResource(this.resourceId, {
+        ...this.clientContext,
+        ...this.serverContext
+      }, this.parentId, true);
       permissions = this.resource[permissionPredicate];
     }
     return permissions ? permissions.map(perm => ContextParser.expandTerm(perm.mode['@type'], this.serverContext, true)) : [];
@@ -733,13 +748,22 @@ class CustomGetter {
     store.clearCache(this.resourceId);
   }
   getExpandedPredicate(property) {
-    return ContextParser.expandTerm(property, this.clientContext, true);
+    return ContextParser.expandTerm(property, {
+      ...this.clientContext,
+      ...this.serverContext
+    }, true);
   }
   getCompactedPredicate(property) {
-    return ContextParser.compactIri(property, this.clientContext, true);
+    return ContextParser.compactIri(property, {
+      ...this.clientContext,
+      ...this.serverContext
+    }, true);
   }
   getCompactedIri(id) {
-    return ContextParser.compactIri(id, this.clientContext);
+    return ContextParser.compactIri(id, {
+      ...this.clientContext,
+      ...this.serverContext
+    });
   }
   toString() {
     return this.getCompactedIri(this.resource['@id']);

package/package.json

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