bruce-models 4.9.8 → 5.0.0

package/dist/bruce-models.es5.js

@@ -368,7 +368,7 @@ class AbstractApi {
         if (noCache) {
             return;
         }
-        if (isNaN(duration)) {
+        if (isNaN(duration) || duration == null) {
             duration = Api.DEFAULT_CACHE_DURATION;
         }
         this.Cache.Set({
@@ -1399,6 +1399,15 @@ class ApiGetters {
         this.env = (params === null || params === void 0 ? void 0 : params.env) ? params.env : Api.EEnv.PROD;
         this.sessionId = params === null || params === void 0 ? void 0 : params.sessionId;
     }
+    prepEnv(_env) {
+        if (!_env) {
+            _env = this.env;
+        }
+        if (!_env) {
+            _env = Api.EEnv.PROD;
+        }
+        return _env.toUpperCase();
+    }
     /**
      * Clears all cache items in all API instances.
      */
@@ -1489,7 +1498,7 @@ class ApiGetters {
         }
         let { accountId, env, loadConfig, loadWebSocket } = params;
         accountId = accountId ? accountId : this.accountId;
-        env = env ? env : this.env;
+        env = this.prepEnv(env);
         const key = `${accountId}-${env}`;
         if (!this.bruce[key]) {
             this.bruce[key] = new BruceApi.Api({
@@ -1533,7 +1542,7 @@ class ApiGetters {
             params = {};
         }
         let { env } = params;
-        env = env ? env : this.env;
+        env = this.prepEnv(env);
         const key = `${env}`;
         if (!this.global[key]) {
             this.global[key] = new GlobalApi.Api({
@@ -1553,7 +1562,7 @@ class ApiGetters {
             params = {};
         }
         let { env } = params;
-        env = env ? env : this.env;
+        env = this.prepEnv(env);
         const key = `${env}`;
         if (!this.guardian[key]) {
             this.guardian[key] = new GuardianApi.Api({
@@ -1657,7 +1666,7 @@ var ENVIRONMENT;
         if (!_getters) {
             _getters = new ApiGetters({
                 accountId: ENVIRONMENT.PARAMS.accountId,
-                env: ENVIRONMENT.PARAMS.env ? ENVIRONMENT.PARAMS.env : Api.EEnv.UAT,
+                env: ENVIRONMENT.PARAMS.env ? ENVIRONMENT.PARAMS.env : Api.EEnv.PROD,
                 sessionId: ENVIRONMENT.PARAMS.sessionId
             });
         }
@@ -1719,7 +1728,7 @@ var AnnDocument;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             const key = GetCacheKey(docId);
-            const cache = yield api.GetCacheItem(key, reqParams);
+            const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -1734,7 +1743,7 @@ var AnnDocument;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -1757,7 +1766,7 @@ var AnnDocument;
             if (!type) {
                 type = "";
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(type, entityId, expandSettings), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(type, entityId, expandSettings), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -1783,7 +1792,7 @@ var AnnDocument;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(type, entityId, expandSettings),
                 value: req,
                 req: reqParams
@@ -1861,7 +1870,7 @@ var CustomForm;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(id), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -1876,7 +1885,7 @@ var CustomForm;
                     rej(err);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(id),
                 value: prom,
                 req: reqParams
@@ -1899,7 +1908,7 @@ var CustomForm;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             yield api.DELETE(`customForm/${id}`, Api.PrepReqParams(reqParams));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.CustomForm);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.CustomForm);
         });
     }
     CustomForm.Delete = Delete;
@@ -1915,7 +1924,7 @@ var CustomForm;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             const url = typeId ? `entityType/${typeId}/customForms` : "customForms";
-            const cache = yield api.GetCacheItem(GetListCacheKey(typeId), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(typeId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -1925,7 +1934,7 @@ var CustomForm;
                     forms: data.Items
                 };
             });
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(typeId),
                 value: prom,
                 req: reqParams
@@ -1949,7 +1958,7 @@ var CustomForm;
                 data.ID = 0;
             }
             const res = yield api.POST(`customForm/${data.ID}`, data, Api.PrepReqParams(reqParams));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.CustomForm);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.CustomForm);
             return {
                 form: res
             };
@@ -2407,7 +2416,7 @@ var EntityType;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             const key = GetCacheKey(typeId);
-            const cache = yield api.GetCacheItem(key, reqParams);
+            const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -2423,7 +2432,7 @@ var EntityType;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -2462,7 +2471,7 @@ var EntityType;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey({
+            const cache = api.GetCacheItem(GetListCacheKey({
                 typeIds: entityTypeIds,
                 parentTypeId,
                 expandSettings,
@@ -2528,7 +2537,7 @@ var EntityType;
                 }
             }));
             if (!parentTypeId) {
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey({
                         typeIds: entityTypeIds,
                         parentTypeId,
@@ -4138,61 +4147,228 @@ var Calculator;
         EValueType[EValueType["RandomColor"] = 5] = "RandomColor";
     })(EValueType = Calculator.EValueType || (Calculator.EValueType = {}));
     /**
-     * Calculates the value of arbitrary field options.
-     * The context calling this should validate results and parse stuff if needed.
-     * @deprecated use specific calls: eg GetColor or GetNumber.
-     * @param fields
-     * @param entity
-     * @param tags
-     * @returns
+     * Calculates a value-type 'T' based on given set of fields.
+     * The supplied data + tags are fed into the calculation.
+     * When a value fails to be calculated, the 'defaultValue' is returned.
+     * If no 'defaultValue' is provided, then 'null' is returned.
      */
-    function GetValue(fields, entity, tags) {
-        if (!(fields === null || fields === void 0 ? void 0 : fields.length)) {
-            return null;
+    function Calculate(params) {
+        let { fields, tags, data, defaultValue, type } = params;
+        if (fields == null) {
+            return defaultValue;
+        }
+        if (data == null || typeof data != "object") {
+            data = {};
         }
-        if (!tags) {
+        if (tags == null || !Array.isArray(tags)) {
             tags = [];
         }
-        if (!entity) {
-            entity = {};
+        if (type == null) {
+            type = "any";
         }
-        for (let i = 0; i < fields.length; i++) {
-            const field = fields[i];
-            let value;
+        // Normalize fields to be an array of options.
+        let fieldsArr = [];
+        if (Array.isArray(fields)) {
+            fieldsArr = fields;
+        }
+        else {
+            fieldsArr = [fields];
+        }
+        // Indicator for old data.
+        // When a range is provided in older data, it is expected that invalid/failed mappings should default to the minimum value.
+        // We are deprecating this logic.
+        // The first step of deprecation is to avoid using this logic when multiple calculations are provided.
+        // TODO: When we've reviewed all existing uses, we can remove this logic entirely and just update the needed style records.
+        let shouldRangesDefaultToMin = true;
+        // This reduce totals the number of mappings and gradients.
+        // >1 means we should not default to min as there are multiple calculations.
+        if (fieldsArr.reduce((acc, field) => acc += (field.type == EValueType.Mapping || field.type == EValueType.Gradient) ? 1 : 0, 0) > 1) {
+            shouldRangesDefaultToMin = false;
+        }
+        const assertColor = (color) => {
+            if (color && typeof color == "string") {
+                color = Color.ColorFromStr(color);
+            }
+            if (color && typeof color == "object" && !isNaN(color.red) && color.red != null) {
+                return color;
+            }
+            return null;
+        };
+        const isColor = (value) => {
+            if (value && typeof value == "object" && !isNaN(value.red) && value.red != null) {
+                return true;
+            }
+            return false;
+        };
+        // Calculate the value.
+        let value = null;
+        for (let i = 0; i < fieldsArr.length; i++) {
+            let field = fieldsArr[i];
+            if (field) {
+                // Dereference.
+                // We do this because we'll be modifying the field to fix bad data.
+                field = JSON.parse(JSON.stringify(field));
+            }
+            // Bad data has it set to 'color' but expects the input to be a number.
+            if (type == "number" && field.type == EValueType.Color) {
+                field.type = EValueType.Input;
+            }
             switch (field.type) {
                 case EValueType.Color:
+                    if (type === "number") {
+                        break;
+                    }
                     value = field.value;
-                    if (value) {
-                        value = Color.ColorFromStr(value);
+                    value = assertColor(value);
+                    if (value && type == "string") {
+                        value = `rgba(${value.red},${value.green},${value.blue},${value.alpha})`;
                     }
                     break;
                 case EValueType.Gradient:
-                    value = GetGradientValue(field.value, entity);
-                    break;
-                case EValueType.Input:
-                    value = GetInputValue(field.value, entity);
-                    break;
-                case EValueType.Mapping:
-                    value = GetMappingValue(field.value, entity);
+                    if (type === "number") {
+                        break;
+                    }
+                    value = GetGradientValue(field.value, data, shouldRangesDefaultToMin);
+                    value = assertColor(value);
+                    if (value && type == "string") {
+                        value = `rgba(${value.red},${value.green},${value.blue},${value.alpha})`;
+                    }
                     break;
                 case EValueType.RandomColor:
+                    if (type === "number") {
+                        break;
+                    }
                     value = Color.RandomColor();
+                    value = assertColor(value);
+                    if (value && type == "string") {
+                        value = `rgba(${value.red},${value.green},${value.blue},${value.alpha})`;
+                    }
                     break;
                 case EValueType.TagColor:
+                    if (type === "number") {
+                        break;
+                    }
                     for (let i = 0; i < tags.length; i++) {
                         const tag = tags[i];
                         if (tag.Color) {
                             value = Color.ColorFromStr(tag.Color);
-                            break;
+                            value = assertColor(value);
+                            if (value) {
+                                break;
+                            }
+                        }
+                    }
+                    if (value && type == "string") {
+                        const cColor = value;
+                        value = `rgba(${cColor.red},${cColor.green},${cColor.blue},${cColor.alpha})`;
+                    }
+                    break;
+                // Input can be an arbitrary value.
+                // Eg: Result is a colour, a number, a string.
+                // This means we first calculate the value, then validate it in the context of the desired type.
+                case EValueType.Input:
+                    value = GetInputValue(field.value, data);
+                    if (value != null) {
+                        if (type == "number") {
+                            if (typeof value == "string" && value != "" && value != null && value != undefined) {
+                                value = Number(value);
+                            }
+                            else if (typeof value != "number") {
+                                value = null;
+                            }
+                        }
+                        else if (type == "string") {
+                            if (typeof value == "number") {
+                                value = String(value);
+                            }
+                            else if (typeof value == "object") {
+                                if (isColor(value)) {
+                                    value = `rgba(${value.red},${value.green},${value.blue},${value.alpha})`;
+                                }
+                                else {
+                                    value = null;
+                                }
+                            }
+                        }
+                        else if (type == "color") {
+                            value = assertColor(value);
+                        }
+                    }
+                    break;
+                // Mapping can be an arbitrary value.
+                // Eg: mapping a value to a Client File ID, or a colour, or a number.
+                // This means we first calculate the value, then validate it in the context of the desired type.
+                case EValueType.Mapping:
+                    value = GetMappingValue(field.value, data);
+                    if (value != null) {
+                        if (type == "number") {
+                            if (typeof value == "string" && value != "" && value != null && value != undefined) {
+                                value = Number(value);
+                            }
+                            else if (typeof value != "number") {
+                                value = null;
+                            }
+                        }
+                        else if (type == "string") {
+                            if (typeof value == "number") {
+                                value = String(value);
+                            }
+                            else if (typeof value == "object") {
+                                if (isColor(value)) {
+                                    value = `rgba(${value.red},${value.green},${value.blue},${value.alpha})`;
+                                }
+                                else {
+                                    value = null;
+                                }
+                            }
+                        }
+                        else if (type == "color") {
+                            value = assertColor(typeof value === "number" ? String(value) : value);
                         }
                     }
                     break;
             }
-            if (value || value == 0) {
-                return value;
+            // Extra layer of validation.
+            // This is a backup in case some branch above failed to convert into the right type.
+            if (type == "number") {
+                if (typeof value !== "number" || isNaN(value)) {
+                    value = null;
+                }
+            }
+            else if (type == "color") {
+                if (typeof value !== "object" || !value) {
+                    value = null;
+                }
+            }
+            else if (type == "string") {
+                if (typeof value !== "string" || !value) {
+                    value = null;
+                }
+            }
+            if (value != null) {
+                break;
             }
         }
-        return null;
+        // Return the value or default.
+        return value != null ? value : defaultValue;
+    }
+    Calculator.Calculate = Calculate;
+    /**
+     * Calculates the value of arbitrary field options.
+     * The context calling this should validate results and parse stuff if needed.
+     * @param fields
+     * @param entity
+     * @param tags
+     * @returns
+     */
+    function GetValue(fields, entity = {}, tags = []) {
+        return Calculate({
+            fields: fields,
+            data: entity,
+            defaultValue: null,
+            tags: tags,
+            type: "any"
+        });
     }
     Calculator.GetValue = GetValue;
     /**
@@ -4202,53 +4378,14 @@ var Calculator;
      * @param entity
      * @param tags
      */
-    function GetColor(fields, entity, tags) {
-        if (!(fields === null || fields === void 0 ? void 0 : fields.length)) {
-            return null;
-        }
-        if (!tags) {
-            tags = [];
-        }
-        if (!entity) {
-            entity = {};
-        }
-        for (let i = 0; i < fields.length; i++) {
-            const field = fields[i];
-            let value;
-            switch (field.type) {
-                case EValueType.Color:
-                    value = field.value;
-                    break;
-                case EValueType.Gradient:
-                    value = GetGradientValue(field.value, entity);
-                    break;
-                case EValueType.Input:
-                    value = GetInputValue(field.value, entity);
-                    break;
-                case EValueType.Mapping:
-                    value = GetMappingValue(field.value, entity);
-                    break;
-                case EValueType.RandomColor:
-                    value = Color.RandomColor();
-                    break;
-                case EValueType.TagColor:
-                    for (let i = 0; i < tags.length; i++) {
-                        const tag = tags[i];
-                        if (tag.Color) {
-                            value = Color.ColorFromStr(tag.Color);
-                            break;
-                        }
-                    }
-                    break;
-            }
-            if (typeof value === "string") {
-                value = Color.ColorFromStr(value);
-            }
-            if (value && typeof value === "object" && (value.red || value.red == 0)) {
-                return value;
-            }
-        }
-        return null;
+    function GetColor(fields, entity = {}, tags = []) {
+        return Calculate({
+            fields: fields,
+            data: entity,
+            defaultValue: null,
+            tags: tags,
+            type: "color"
+        });
     }
     Calculator.GetColor = GetColor;
     /**
@@ -4259,39 +4396,14 @@ var Calculator;
      * @param tags
      * @returns
      */
-    function GetNumber(fields, entity, tags) {
-        if (!(fields === null || fields === void 0 ? void 0 : fields.length)) {
-            return null;
-        }
-        if (!tags) {
-            tags = [];
-        }
-        if (!entity) {
-            entity = {};
-        }
-        for (let i = 0; i < fields.length; i++) {
-            const field = fields[i];
-            let value;
-            switch (field.type) {
-                case EValueType.Gradient:
-                    value = GetGradientValue(field.value, entity);
-                    break;
-                case EValueType.Color:
-                case EValueType.Input:
-                    value = GetInputValue(field.value, entity);
-                    break;
-                case EValueType.Mapping:
-                    value = GetMappingValue(field.value, entity);
-                    break;
-            }
-            if (value != "" && value != null && value != undefined) {
-                value = Number(value);
-            }
-            if (value || value == 0) {
-                return value;
-            }
-        }
-        return null;
+    function GetNumber(fields, entity = {}, tags = []) {
+        return Calculate({
+            fields: fields,
+            data: entity,
+            defaultValue: null,
+            tags: tags,
+            type: "number"
+        });
     }
     Calculator.GetNumber = GetNumber;
     /**
@@ -4302,68 +4414,14 @@ var Calculator;
      * @param tags
      * @returns
      */
-    function GetString(fields, entity, tags) {
-        if (!(fields === null || fields === void 0 ? void 0 : fields.length)) {
-            return null;
-        }
-        if (!tags) {
-            tags = [];
-        }
-        if (!entity) {
-            entity = {};
-        }
-        for (let i = 0; i < fields.length; i++) {
-            const field = fields[i];
-            let value;
-            switch (field.type) {
-                case EValueType.Gradient:
-                    {
-                        const tmp = GetGradientValue(field.value, entity);
-                        // This avoids null turning into "null".
-                        if (tmp) {
-                            value = String(tmp);
-                        }
-                    }
-                    break;
-                case EValueType.Color:
-                case EValueType.Input:
-                    {
-                        const tmp = GetInputValue(field.value, entity);
-                        // This avoids null turning into "null".
-                        if (tmp) {
-                            value = String(tmp);
-                        }
-                    }
-                    break;
-                case EValueType.Mapping:
-                    {
-                        const tmp = GetMappingValue(field.value, entity);
-                        // This avoids null turning into "null".
-                        if (tmp) {
-                            value = String(tmp);
-                        }
-                    }
-                    break;
-                case EValueType.RandomColor:
-                    // Would be nice to randomize based on an attribute or entity ID instead of pure random.
-                    var color = Color.RandomColor();
-                    value = `rgba(${color.red},${color.green},${color.blue},${color.alpha})`;
-                    break;
-                case EValueType.TagColor:
-                    for (let i = 0; i < tags.length; i++) {
-                        const tag = tags[i];
-                        if (tag.Color) {
-                            value = tag.Color;
-                            break;
-                        }
-                    }
-                    break;
-            }
-            if (value) {
-                return value;
-            }
-        }
-        return null;
+    function GetString(fields, entity = {}, tags = []) {
+        return Calculate({
+            fields: fields,
+            data: entity,
+            defaultValue: null,
+            tags: tags,
+            type: "string"
+        });
     }
     Calculator.GetString = GetString;
     /**
@@ -4431,9 +4489,11 @@ var Calculator;
      * It is intended to be parsed and validated within a value-type context. Eg: GetColor, GetNumber, GetString.
      * @param value
      * @param entity
+     * @param defaultToMin if a value fails to be calculated, should we default to the minimum value?
+     * Default is true for backwards compatibility.
      * @returns
      */
-    function GetGradientValue(value, entity) {
+    function GetGradientValue(value, entity, defaultToMin) {
         const min = +value.points[0].position;
         const max = +value.points[value.points.length - 1].position;
         const attrPaths = parseLegacyPath(value.field);
@@ -5611,7 +5671,7 @@ var EntityAttachmentType;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -5626,7 +5686,7 @@ var EntityAttachmentType;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: req,
                 req: reqParams
@@ -5696,7 +5756,7 @@ var EntityAttachment;
                     api.Cache.Remove(GetCacheKey(attachments[i].ID));
                 }
             }
-            yield api.Cache.Remove(GetListCacheKey(entityId));
+            api.Cache.Remove(GetListCacheKey(entityId));
             return {
                 attachments: res.attachments
             };
@@ -5727,7 +5787,7 @@ var EntityAttachment;
             for (let i = 0; i < attachments.length; i++) {
                 api.Cache.Remove(GetCacheKey(attachments[i].ID));
             }
-            yield api.Cache.RemoveByStartsWith(GetListCacheKey(entityId));
+            api.Cache.RemoveByStartsWith(GetListCacheKey(entityId));
         });
     }
     EntityAttachment.UpdateOrder = UpdateOrder;
@@ -5745,8 +5805,8 @@ var EntityAttachment;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             yield api.DELETE(`entity/${entityId}/attachments/${attachmentId}`, Api.PrepReqParams(req));
-            yield api.Cache.Remove(GetCacheKey(attachmentId));
-            yield api.Cache.Remove(GetListCacheKey(params.entityId));
+            api.Cache.Remove(GetCacheKey(attachmentId));
+            api.Cache.Remove(GetListCacheKey(params.entityId));
         });
     }
     EntityAttachment.Delete = Delete;
@@ -5764,7 +5824,7 @@ var EntityAttachment;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(entityId), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(entityId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -5779,7 +5839,7 @@ var EntityAttachment;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(entityId),
                 value: req,
                 req: reqParams
@@ -5868,7 +5928,7 @@ var EntityComment;
             const url = `entity/${data["TargetObject.ID"]}/comment` + (data.ID == null ? "" : "/" + data.ID);
             const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Comment + Api.ECacheKey.Entity);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Comment + Api.ECacheKey.Entity);
             return {
                 comment: res
             };
@@ -5890,7 +5950,7 @@ var EntityComment;
             }
             yield api.DELETE(`entity/${entityId}/comment/${commentId}`, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(commentId));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Comment + Api.ECacheKey.Entity);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Comment + Api.ECacheKey.Entity);
         });
     }
     EntityComment.Delete = Delete;
@@ -5908,7 +5968,7 @@ var EntityComment;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(entityId), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(entityId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -5923,7 +5983,7 @@ var EntityComment;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(entityId),
                 value: req,
                 req: reqParams
@@ -5985,7 +6045,7 @@ var EntityLink;
             const url = `entity/${data["Entity.ID"]}/link` + (data.ID == null ? "" : "/" + data.ID);
             const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Link + Api.ECacheKey.Entity);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Link + Api.ECacheKey.Entity);
             return {
                 link: res
             };
@@ -6007,7 +6067,7 @@ var EntityLink;
             }
             yield api.DELETE(`entity/${entityId}/link/${linkId}`, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(linkId));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Link + Api.ECacheKey.Entity);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Link + Api.ECacheKey.Entity);
         });
     }
     EntityLink.Delete = Delete;
@@ -6025,7 +6085,7 @@ var EntityLink;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(entityId), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(entityId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -6040,7 +6100,7 @@ var EntityLink;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(entityId),
                 value: req,
                 req: reqParams
@@ -6130,7 +6190,7 @@ var EntityLod;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(url), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(url), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -6145,7 +6205,7 @@ var EntityLod;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(url),
                 value: req,
                 req: reqParams
@@ -6192,7 +6252,7 @@ var EntityLod;
             if (!entityId) {
                 throw ("Entity id is required.");
             }
-            const cache = yield api.GetCacheItem(GetEntityListKey(entityId), reqParams);
+            const cache = api.GetCacheItem(GetEntityListKey(entityId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -6208,7 +6268,7 @@ var EntityLod;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetEntityListKey(entityId),
                 value: prom,
                 req: reqParams
@@ -6230,7 +6290,7 @@ var EntityLod;
             if (!group) {
                 group = "DEFAULT";
             }
-            const cache = yield api.GetCacheItem(GetTypeListKey(typeId, group), reqParams);
+            const cache = api.GetCacheItem(GetTypeListKey(typeId, group), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -6247,7 +6307,7 @@ var EntityLod;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetTypeListKey(typeId, group),
                 value: prom,
                 req: reqParams
@@ -6366,7 +6426,7 @@ var EntityLodCategory;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -6381,7 +6441,7 @@ var EntityLodCategory;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: req,
                 req: reqParams
@@ -6404,7 +6464,7 @@ var EntityLodCategory;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(id), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -6419,7 +6479,7 @@ var EntityLodCategory;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(id),
                 value: req,
                 req: reqParams
@@ -6520,7 +6580,7 @@ var EntityRelationType;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             const key = GetCacheKey(typeId);
-            const cache = yield api.GetCacheItem(key, reqParams);
+            const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -6535,7 +6595,7 @@ var EntityRelationType;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -6574,7 +6634,7 @@ var EntityRelationType;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -6589,7 +6649,7 @@ var EntityRelationType;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: req,
                 req: reqParams
@@ -6678,11 +6738,11 @@ var EntityRelation;
             };
             const url = `entity/${data["Principal.Entity.ID"]}/relation/${data["Relation.Type.ID"]}/add`;
             yield api.POST(url, reqData, Api.PrepReqParams(reqParams));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Principal.Entity.ID"]);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Related.Entity.ID"]);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Principal.Entity.ID"]);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Related.Entity.ID"]);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType);
             if (data["Data.Entity.ID"]) {
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Entity + Api.ECacheKey.Id + data["Data.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Entity + Api.ECacheKey.Id + data["Data.Entity.ID"]);
             }
         });
     }
@@ -6705,9 +6765,9 @@ var EntityRelation;
                 "Related.Entity.ID": [relatedEntityId]
             }, Api.PrepReqParams(reqParams));
             // Remove related cache entries
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + principalEntityId);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + relatedEntityId);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType + Api.ECacheKey.Id + relationTypeId);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + principalEntityId);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + relatedEntityId);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType + Api.ECacheKey.Id + relationTypeId);
         });
     }
     EntityRelation.Delete = Delete;
@@ -6727,11 +6787,11 @@ var EntityRelation;
             }
             const url = `entity/${data["Principal.Entity.ID"]}/otherEntityID/${data["Related.Entity.ID"]}/relation/${data["Relation.Type.ID"]}/update`;
             const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Principal.Entity.ID"]);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Related.Entity.ID"]);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType + Api.ECacheKey.Id + data["Relation.Type.ID"]);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Principal.Entity.ID"]);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Related.Entity.ID"]);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType + Api.ECacheKey.Id + data["Relation.Type.ID"]);
             if (data["Data.Entity.ID"]) {
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Entity + Api.ECacheKey.Id + data["Data.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Entity + Api.ECacheKey.Id + data["Data.Entity.ID"]);
             }
         });
     }
@@ -6751,7 +6811,7 @@ var EntityRelation;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             filter = Object.assign({ relationTypeId: "", oneWayOnly: false, loadEntityData: false }, filter);
-            const cache = yield api.GetCacheItem(GetListCacheKey(entityId, filter), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(entityId, filter), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -6771,7 +6831,7 @@ var EntityRelation;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(entityId, filter),
                 value: req,
                 req: reqParams
@@ -6794,7 +6854,7 @@ var EntityRelation;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetEntityCacheKey(entityId), reqParams);
+            const cache = api.GetCacheItem(GetEntityCacheKey(entityId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -6809,7 +6869,7 @@ var EntityRelation;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetEntityCacheKey(entityId),
                 value: prom,
                 req: reqParams
@@ -6923,7 +6983,7 @@ var EntitySource;
             const reqs = [];
             for (let i = 0; i < sourceKeys.length; i++) {
                 const sourceKey = sourceKeys[i];
-                const cache = yield api.GetCacheItem(GetCacheKey(sourceId, sourceKey), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(sourceId, sourceKey), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     reqs.push(cache.data);
                 }
@@ -7019,7 +7079,7 @@ var EntitySource;
             }
             const res = yield api.POST("entitysource", source);
             const cacheKey = GetCacheKey(source["Source.ID"], source["SourceRecord.Key"]);
-            yield api.Cache.Remove(cacheKey);
+            api.Cache.Remove(cacheKey);
             return {
                 source: res
             };
@@ -7142,7 +7202,7 @@ var EntityTag;
                             rej(e);
                         }
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetCacheKey(id),
                         value: req,
                         req: reqParams
@@ -7167,7 +7227,7 @@ var EntityTag;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(entityTypeId), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(entityTypeId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -7182,7 +7242,7 @@ var EntityTag;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(entityTypeId),
                 value: req,
                 req: reqParams
@@ -7206,7 +7266,7 @@ var EntityTag;
             }
             yield api.DELETE(`layer/${tagId}`, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(tagId));
-            yield api.Cache.RemoveByStartsWith(GetListCacheKey());
+            api.Cache.RemoveByStartsWith(GetListCacheKey());
         });
     }
     EntityTag.Delete = Delete;
@@ -7224,7 +7284,7 @@ var EntityTag;
             const url = data.ID ? `layer/${data.ID}` : "layer";
             const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
-            yield api.Cache.RemoveByStartsWith(GetListCacheKey());
+            api.Cache.RemoveByStartsWith(GetListCacheKey());
             return {
                 tag: res
             };
@@ -7319,7 +7379,7 @@ var EntityCoords;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(entityId), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(entityId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -7334,7 +7394,7 @@ var EntityCoords;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(entityId),
                 value: prom,
                 req: reqParams
@@ -7640,7 +7700,7 @@ var Style;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -7655,7 +7715,7 @@ var Style;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: res,
                 req: reqParams
@@ -7678,7 +7738,7 @@ var Style;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(id), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -7693,7 +7753,7 @@ var Style;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(id),
                 value: prom,
                 req: reqParams
@@ -8386,7 +8446,7 @@ var ClientFile;
                 throw ("File ID is required.");
             }
             const key = GetCacheKey(fileId);
-            const cache = yield api.GetCacheItem(key, reqParams);
+            const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -8401,7 +8461,7 @@ var ClientFile;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -8912,7 +8972,7 @@ var ProgramKey;
             });
             const key = prom.programKeys.find(k => k.ProgramId === programId);
             // const key = GetCacheKey(programId);
-            // const cache = await api.GetCacheItem(key, reqParams);
+            // const cache = api.GetCacheItem(key, reqParams);
             // if (cache?.found) {
             //     return cache.data;
             // }
@@ -8927,7 +8987,7 @@ var ProgramKey;
             //         rej(e);
             //     }
             // });
-            // await api.SetCacheItem({
+            // api.SetCacheItem({
             //     key,
             //     value: prom,
             //     req: reqParams
@@ -8949,7 +9009,7 @@ var ProgramKey;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -8964,7 +9024,7 @@ var ProgramKey;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: req,
                 req: reqParams
@@ -9199,7 +9259,7 @@ var Tileset;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(tilesetId, loadFiles), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(tilesetId, loadFiles), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -9219,7 +9279,7 @@ var Tileset;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(tilesetId, loadFiles),
                 value: prom,
                 req: reqParams
@@ -9275,7 +9335,7 @@ var Tileset;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey({
+            const cache = api.GetCacheItem(GetListCacheKey({
                 assertLocation: assertLocation,
                 expandSettings: expandSettings,
                 type: type
@@ -9315,7 +9375,7 @@ var Tileset;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey({
                     assertLocation: assertLocation,
                     expandSettings: expandSettings,
@@ -9342,8 +9402,8 @@ var Tileset;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             yield api.DELETE(`tileset/delete/${tilesetId}`, reqParams);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset + Api.ECacheKey.Id + tilesetId);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset + Api.ECacheKey.Id + tilesetId);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset);
         });
     }
     Tileset$$1.Delete = Delete;
@@ -9380,8 +9440,8 @@ var Tileset;
                     yield api.POST(`tileset/update/${data.id}`, data, Api.PrepReqParams(reqParams));
                 }
             }
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset + Api.ECacheKey.Id + data.id);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset + Api.ECacheKey.Id + data.id);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset);
             return {
                 tileset: data
             };
@@ -9666,9 +9726,9 @@ var Tileset;
                 };
                 data.ID = res.ID;
                 yield api.POST(`tileset/${data.ID}/enableForAccounts`, req, reqParams);
-                yield api.Cache.Remove(GetCacheKey(data["PublishedBy.ClientAccount.ID"], data["Tileset.ID"]));
-                yield api.Cache.Remove(GetCacheKey(data["PublishedBy.ClientAccount.ID"]));
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.PublishTileset + Api.ECacheKey.TilesetAccess);
+                api.Cache.Remove(GetCacheKey(data["PublishedBy.ClientAccount.ID"], data["Tileset.ID"]));
+                api.Cache.Remove(GetCacheKey(data["PublishedBy.ClientAccount.ID"]));
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.PublishTileset + Api.ECacheKey.TilesetAccess);
                 return {
                     published: data
                 };
@@ -9684,7 +9744,7 @@ var Tileset;
                 if (!accountId || !tilesetId) {
                     throw ("Client account ID and tileset ID are required.");
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(accountId, tilesetId), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(accountId, tilesetId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -9699,7 +9759,7 @@ var Tileset;
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(accountId, tilesetId),
                     value: prom,
                     req: reqParams
@@ -9717,7 +9777,7 @@ var Tileset;
                 if (!accountId) {
                     throw ("Client account ID is required.");
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(accountId), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(accountId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -9732,7 +9792,7 @@ var Tileset;
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(accountId),
                     value: req,
                     req: reqParams
@@ -10071,7 +10131,7 @@ var ProjectViewBookmark;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             const key = GetCacheKey(viewId, bookmarkId);
-            const cache = yield api.GetCacheItem(key, reqParams);
+            const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -10086,7 +10146,7 @@ var ProjectViewBookmark;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -10128,7 +10188,7 @@ var ProjectViewBookmark;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(viewId), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(viewId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -10146,7 +10206,7 @@ var ProjectViewBookmark;
                                 bookmark: item
                             });
                         });
-                        yield api.SetCacheItem({
+                        api.SetCacheItem({
                             key: GetCacheKey(viewId, item.ID),
                             value: prom,
                             req: reqParams
@@ -10160,7 +10220,7 @@ var ProjectViewBookmark;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(viewId),
                 value: req,
                 req: reqParams
@@ -10207,7 +10267,7 @@ var ProjectViewBookmark;
                 "DisplayOrder.Start": 0
             };
             yield api.POST(`ui.view/${viewId}/slides/setOrder`, reqData, Api.PrepReqParams(reqParams));
-            yield api.Cache.RemoveByStartsWith(GetListCacheKey(viewId));
+            api.Cache.RemoveByStartsWith(GetListCacheKey(viewId));
         });
     }
     ProjectViewBookmark.SetOrder = SetOrder;
@@ -10273,7 +10333,7 @@ var ProjectView;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             const key = GetCacheKey(viewId);
-            const cache = yield api.GetCacheItem(key, reqParams);
+            const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -10288,7 +10348,7 @@ var ProjectView;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -10308,7 +10368,7 @@ var ProjectView;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(type), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(type), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -10323,7 +10383,7 @@ var ProjectView;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(type),
                 value: prom,
                 req: reqParams
@@ -10937,7 +10997,7 @@ var Account;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(id), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -10946,7 +11006,7 @@ var Account;
                     const data = yield api.GET(`accountbyid/${id}`, reqParams);
                     // Update the cache by subdomain as well in case it's different to the ID.
                     if ((data === null || data === void 0 ? void 0 : data.ID) && (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) != false) {
-                        yield api.SetCacheItem({
+                        api.SetCacheItem({
                             key: data.Subdomain,
                             value: prom,
                             req: reqParams
@@ -10960,7 +11020,7 @@ var Account;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(id),
                 value: prom,
                 req: reqParams
@@ -10980,7 +11040,7 @@ var Account;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(subdomain), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(subdomain), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -10989,7 +11049,7 @@ var Account;
                     const data = yield api.GET(`account/${subdomain}`, reqParams);
                     // Update the cache by ID as well in case it's different to the subdomain.
                     if ((data === null || data === void 0 ? void 0 : data.ID) && (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) != false) {
-                        yield api.SetCacheItem({
+                        api.SetCacheItem({
                             key: data.ID,
                             value: prom,
                             req: reqParams
@@ -11003,7 +11063,7 @@ var Account;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(subdomain),
                 value: prom,
                 req: reqParams
@@ -11023,7 +11083,7 @@ var Account;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(api.GetSessionId()), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(api.GetSessionId()), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -11040,7 +11100,7 @@ var Account;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(api.GetSessionId()),
                 value: prom,
                 req: reqParams
@@ -11060,7 +11120,7 @@ var Account;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(id, appId), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(id, appId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -11078,7 +11138,7 @@ var Account;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(id, appId),
                 value: prom,
                 req: reqParams
@@ -11100,7 +11160,7 @@ var Account;
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
             const res = yield api.POST(`account/${id}/applicationSettings/${appId}`, data, reqParams);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Account + Api.ECacheKey.Id + id);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Account + Api.ECacheKey.Id + id);
             return {
                 settings: res
             };
@@ -11441,7 +11501,7 @@ var Session;
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
             const key = GetCacheKey(sessionId);
-            const cache = yield api.GetCacheItem(key, reqParams);
+            const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -11456,7 +11516,7 @@ var Session;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams,
@@ -11846,13 +11906,22 @@ var User;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(id, accountId), reqParams);
+            const cacheKey = GetCacheKey(id, accountId);
+            const cache = api.GetCacheItem(cacheKey, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET(`user/${id}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
+                    const urlParams = new URLSearchParams();
+                    if (accountId) {
+                        urlParams.append("clientAccountID", accountId);
+                    }
+                    let url = `user/${id}`;
+                    if (urlParams.toString().length) {
+                        url += "?" + urlParams.toString();
+                    }
+                    const data = yield api.GET(url, reqParams);
                     res({
                         user: data
                     });
@@ -11861,8 +11930,8 @@ var User;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
-                key: GetCacheKey(id, accountId),
+            api.SetCacheItem({
+                key: cacheKey,
                 value: prom,
                 req: reqParams
             });
@@ -11901,10 +11970,10 @@ var User;
             const res = yield api.POST(`user/${data.ID}`, data, reqParams);
             api.Cache.RemoveByContains(Api.ECacheKey.User + Api.ECacheKey.Id + data.ID);
             if (data.Type == EType.AccessToken) {
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
             }
             else if (data.Type == EType.User) {
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.User + Api.ECacheKey.Account);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.User + Api.ECacheKey.Account);
             }
             return {
                 user: res
@@ -11926,7 +11995,7 @@ var User;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = yield api.GetCacheItem(GetSettingsCacheKey(userId, appId), req);
+            const cache = api.GetCacheItem(GetSettingsCacheKey(userId, appId), req);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -11952,7 +12021,7 @@ var User;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetSettingsCacheKey(userId, appId),
                 value: prom,
                 req: req
@@ -12048,7 +12117,7 @@ var User;
                 if (!api) {
                     api = ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cache = yield api.GetCacheItem(GetEmailCacheKey(email, accountId), reqParams);
+                const cache = api.GetCacheItem(GetEmailCacheKey(email, accountId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -12063,7 +12132,7 @@ var User;
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetEmailCacheKey(email, accountId),
                     value: prom,
                     req: reqParams
@@ -12089,7 +12158,7 @@ var User;
                 if (!exclusive) {
                     exclusive = false;
                 }
-                const cache = exclusive ? null : yield api.GetCacheItem(GetListCacheKey(accountId), reqParams);
+                const cache = exclusive ? null : api.GetCacheItem(GetListCacheKey(accountId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -12107,7 +12176,7 @@ var User;
                 req.then((data) => __awaiter(this, void 0, void 0, function* () {
                     const users = data.users;
                     for (let i = 0; i < users.length; i++) {
-                        yield api.SetCacheItem({
+                        api.SetCacheItem({
                             key: GetCacheKey(users[i].ID, accountId),
                             value: {
                                 user: users[i]
@@ -12117,7 +12186,7 @@ var User;
                     }
                 }));
                 if (!exclusive) {
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetListCacheKey(accountId),
                         value: req,
                         req: reqParams
@@ -12284,7 +12353,7 @@ var User;
                 if (!api) {
                     api = ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(accountId), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(accountId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -12299,7 +12368,7 @@ var User;
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(accountId),
                     value: req,
                     req: reqParams
@@ -12320,7 +12389,7 @@ var User;
                 }
                 yield api.DELETE(`accessToken/${id}`, reqParams);
                 api.Cache.RemoveByContains(Api.ECacheKey.User + Api.ECacheKey.Id + id);
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
             });
         }
         AccessToken.Delete = Delete;
@@ -12345,7 +12414,7 @@ var User;
                     data.Type = EType.AccessToken;
                 }
                 data = yield api.POST("accessToken", data, reqParams);
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
                 return {
                     user: data
                 };
@@ -12559,7 +12628,7 @@ var AccountFeatures;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             const accountId = api.AccountId;
-            const cache = yield api.GetCacheItem(GetCacheKey(accountId), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(accountId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -13597,7 +13666,7 @@ var ImportedFile;
             if (!pageIndex) {
                 pageIndex = 0;
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(type, pageIndex), reqParams);
+            const cache = api.GetCacheItem(GetListCacheKey(type, pageIndex), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -13622,7 +13691,7 @@ var ImportedFile;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(type, pageIndex),
                 value: prom,
                 req: reqParams
@@ -13642,7 +13711,7 @@ var ImportedFile;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKeyByRootId(rootId), reqParams);
+            const cache = api.GetCacheItem(GetCacheKeyByRootId(rootId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -13657,7 +13726,7 @@ var ImportedFile;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKeyByRootId(rootId),
                 value: prom,
                 req: reqParams
@@ -13677,7 +13746,7 @@ var ImportedFile;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(fileId), reqParams);
+            const cache = api.GetCacheItem(GetCacheKey(fileId), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -13692,7 +13761,7 @@ var ImportedFile;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(fileId),
                 value: prom,
                 req: reqParams
@@ -13914,7 +13983,7 @@ var Plugin;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetCacheKey(pluginId), req);
+            const cache = api.GetCacheItem(GetCacheKey(pluginId), req);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -13929,7 +13998,7 @@ var Plugin;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(pluginId),
                 value: prom,
                 req: req
@@ -13949,7 +14018,7 @@ var Plugin;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey(), req);
+            const cache = api.GetCacheItem(GetListCacheKey(), req);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -13964,7 +14033,7 @@ var Plugin;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: prom,
                 req: req
@@ -14249,8 +14318,8 @@ var DataSource;
             }
             const url = `source` + (data.ID == null ? "" : "/" + data.ID);
             const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
-            yield api.Cache.Remove(GetCacheKey(data.ID));
-            yield api.Cache.Remove(GetListCacheKey());
+            api.Cache.Remove(GetCacheKey(data.ID));
+            api.Cache.Remove(GetListCacheKey());
             return {
                 source: res
             };
@@ -14268,8 +14337,8 @@ var DataSource;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             yield api.DELETE(`source/${id}`, Api.PrepReqParams(reqParams));
-            yield api.Cache.Remove(GetCacheKey(id));
-            yield api.Cache.Remove(GetListCacheKey());
+            api.Cache.Remove(GetCacheKey(id));
+            api.Cache.Remove(GetListCacheKey());
         });
     }
     DataSource.Delete = Delete;
@@ -14285,7 +14354,7 @@ var DataSource;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             reqParams = Api.PrepReqParams(reqParams);
-            const cacheData = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+            const cacheData = api.GetCacheItem(GetCacheKey(id), reqParams);
             if (cacheData === null || cacheData === void 0 ? void 0 : cacheData.found) {
                 return cacheData.data;
             }
@@ -14321,7 +14390,7 @@ var DataSource;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             reqParams = Api.PrepReqParams(reqParams);
-            const cacheData = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+            const cacheData = api.GetCacheItem(GetListCacheKey(), reqParams);
             if (cacheData === null || cacheData === void 0 ? void 0 : cacheData.found) {
                 return cacheData.data;
             }
@@ -14399,7 +14468,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.9.8";
+const VERSION = "5.0.0";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, GeoJson, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, AccountLimits, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map