bruce-models 4.1.6 → 4.1.8

package/dist/bruce-models.umd.js

@@ -3253,11 +3253,18 @@
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const urlParams = new URLSearchParams();
+                        let expand;
                         if (expandLocation) {
-                            urlParams.append("$expand", "location");
+                            expand = "location";
                         }
                         if (expandRelations) {
-                            urlParams.append("$expand", "relation");
+                            if (expand) {
+                                expand += ",";
+                            }
+                            expand += "relation";
+                        }
+                        if (expand) {
+                            urlParams.append("$expand", expand);
                         }
                         if (entityTypeId) {
                             urlParams.append("BruceEntityType", entityTypeId);
@@ -3302,7 +3309,7 @@
          */
         function GetListByIds(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, entityIds, schemaId, req: reqParams, expandRelations, expandLocation, historicFrom, historicKey, historicTo, historicPoint } = params;
+                let { api, entityIds, schemaId, req: reqParams, expandRelations, expandLocation, historicFrom, historicKey, historicTo, historicPoint, expandSources } = params;
                 if (!entityIds.length) {
                     throw ("Entity IDs are required.");
                 }
@@ -3333,8 +3340,16 @@
                 if (expandRelations) {
                     reqData["Expand"] = "relation";
                 }
-                else if (expandLocation) {
-                    reqData["Expand"] = "location";
+                if (expandLocation) {
+                    if (reqData["Expand"]) {
+                        reqData["Expand"] += ",location";
+                    }
+                    else {
+                        reqData["Expand"] = "location";
+                    }
+                }
+                if (expandSources) {
+                    reqData["ExpandSources"] = true;
                 }
                 if (historicKey) {
                     reqData["historicKey"] = historicKey;
@@ -3362,6 +3377,7 @@
                             entityId,
                             expandLocation,
                             expandRelations,
+                            expandSources,
                             entityTypeId: null,
                             historicFrom: historicFrom,
                             historicKey: historicKey,
@@ -3652,7 +3668,7 @@
         function GetList(params) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, filter, schemaId, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations, historicFrom, historicKey, historicTo, historicPoint } = params;
+                let { api, filter, schemaId, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations, historicFrom, historicKey, historicTo, historicPoint, expandLocation, expandSources } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
@@ -3692,8 +3708,24 @@
                     historicKey: historicKey,
                     historicFrom: historicFrom,
                     historicTo: historicTo,
-                    historicPoint: historicPoint
+                    historicPoint: historicPoint,
+                    ExpandSources: expandSources
                 };
+                if (expandLocation || expandRelations) {
+                    let expand = "";
+                    if (expandLocation) {
+                        expand += "location";
+                    }
+                    if (expandRelations) {
+                        if (expand) {
+                            expand += ",";
+                        }
+                        expand += "relation";
+                    }
+                    if (expand) {
+                        body["Expand"] = expand;
+                    }
+                }
                 let totalCount;
                 let entities = [];
                 if (analysis || expandRelations || (viaCdn && api.EntityCdnUrl)) {
@@ -3733,6 +3765,12 @@
                     if (expandRelations) {
                         urlParams.append("$expand", "relation");
                     }
+                    if (expandLocation) {
+                        urlParams.append("$expand", "location");
+                    }
+                    if (expandSources) {
+                        urlParams.append("ExpandSources", "true");
+                    }
                     if (historicKey) {
                         urlParams.set("historicKey", historicKey);
                     }
@@ -3761,6 +3799,9 @@
                     if (expandRelations) {
                         urlParams.append("$expand", "relation");
                     }
+                    if (expandLocation) {
+                        urlParams.append("$expand", "location");
+                    }
                     if (schemaId) {
                         urlParams.set("schema", schemaId);
                     }
@@ -3776,7 +3817,8 @@
                                 key: GetCacheKey({
                                     entityId: id,
                                     expandRelations,
-                                    expandLocation: false,
+                                    expandLocation,
+                                    expandSources,
                                     entityTypeId: filter.entityTypeId,
                                     historicFrom: historicFrom,
                                     historicKey: historicKey,
@@ -3929,7 +3971,7 @@
          * @returns
          */
         function GetCacheKey(params) {
-            let { entityId, entityTypeId, schemaId, expandLocation, expandRelations, historicFrom, historicKey, historicTo, historicPoint } = params;
+            let { entityId, entityTypeId, schemaId, expandLocation, expandRelations, expandSources, historicFrom, historicKey, historicTo, historicPoint } = params;
             if (!entityTypeId) {
                 entityTypeId = "";
             }
@@ -3949,7 +3991,7 @@
                 schemaId = "";
             }
             let key = `${exports.Api.ECacheKey.Entity}${exports.Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${schemaId}`;
-            key += `${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}`;
+            key += `${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}${String(Boolean(expandSources))}`;
             key += `${exports.Api.ECacheKey.EntityHistoricData}${exports.Api.ECacheKey.Id}${historicKey}-${historicFrom}-${historicTo}-${historicPoint}`;
             return key;
         }
@@ -11157,17 +11199,18 @@
             EFeature["EntityLexicalSearch"] = "Feature_Entity_Lexical_Search";
         })(EFeature = AccountFeatures.EFeature || (AccountFeatures.EFeature = {}));
         /**
-         * Gets account features corresponding to an account ID.
+         * Gets account features corresponding to the API instance's account.
          * @param params
          * @returns
          */
         function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, accountId: id, req: reqParams } = params;
+                let { api, req: reqParams } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+                const accountId = api.AccountId;
+                const cache = yield api.GetCacheItem(GetCacheKey(accountId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -11184,7 +11227,7 @@
                     }
                 }));
                 api.SetCacheItem({
-                    key: GetCacheKey(id),
+                    key: GetCacheKey(accountId),
                     value: prom,
                     req: reqParams
                 });
@@ -11194,10 +11237,11 @@
         AccountFeatures.Get = Get;
         function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, accountId: id, features, req: reqParams } = params;
+                let { api, features, req: reqParams } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
+                const accountId = api.AccountId;
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.POST("features", {
@@ -11212,7 +11256,7 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Remove(GetCacheKey(id));
+                api.Cache.Remove(GetCacheKey(accountId));
                 return prom;
             });
         }
@@ -12848,7 +12892,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.1.6";
+    const VERSION = "4.1.8";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;