bruce-models 4.9.8 → 5.0.0

package/dist/bruce-models.umd.js

@@ -373,7 +373,7 @@
             if (noCache) {
                 return;
             }
-            if (isNaN(duration)) {
+            if (isNaN(duration) || duration == null) {
                 duration = exports.Api.DEFAULT_CACHE_DURATION;
             }
             this.Cache.Set({
@@ -1384,6 +1384,15 @@
             this.env = (params === null || params === void 0 ? void 0 : params.env) ? params.env : exports.Api.EEnv.PROD;
             this.sessionId = params === null || params === void 0 ? void 0 : params.sessionId;
         }
+        prepEnv(_env) {
+            if (!_env) {
+                _env = this.env;
+            }
+            if (!_env) {
+                _env = exports.Api.EEnv.PROD;
+            }
+            return _env.toUpperCase();
+        }
         /**
          * Clears all cache items in all API instances.
          */
@@ -1474,7 +1483,7 @@
             }
             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 exports.BruceApi.Api({
@@ -1518,7 +1527,7 @@
                 params = {};
             }
             let { env } = params;
-            env = env ? env : this.env;
+            env = this.prepEnv(env);
             const key = `${env}`;
             if (!this.global[key]) {
                 this.global[key] = new exports.GlobalApi.Api({
@@ -1538,7 +1547,7 @@
                 params = {};
             }
             let { env } = params;
-            env = env ? env : this.env;
+            env = this.prepEnv(env);
             const key = `${env}`;
             if (!this.guardian[key]) {
                 this.guardian[key] = new exports.GuardianApi.Api({
@@ -1641,7 +1650,7 @@
             if (!_getters) {
                 _getters = new ApiGetters({
                     accountId: ENVIRONMENT.PARAMS.accountId,
-                    env: ENVIRONMENT.PARAMS.env ? ENVIRONMENT.PARAMS.env : exports.Api.EEnv.UAT,
+                    env: ENVIRONMENT.PARAMS.env ? ENVIRONMENT.PARAMS.env : exports.Api.EEnv.PROD,
                     sessionId: ENVIRONMENT.PARAMS.sessionId
                 });
             }
@@ -1698,7 +1707,7 @@
                     api = exports.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;
                 }
@@ -1713,7 +1722,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -1736,7 +1745,7 @@
                 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;
                 }
@@ -1762,7 +1771,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(type, entityId, expandSettings),
                     value: req,
                     req: reqParams
@@ -1835,7 +1844,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -1850,7 +1859,7 @@
                         rej(err);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(id),
                     value: prom,
                     req: reqParams
@@ -1873,7 +1882,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 yield api.DELETE(`customForm/${id}`, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.CustomForm);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.CustomForm);
             });
         }
         CustomForm.Delete = Delete;
@@ -1889,7 +1898,7 @@
                     api = exports.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;
                 }
@@ -1899,7 +1908,7 @@
                         forms: data.Items
                     };
                 });
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(typeId),
                     value: prom,
                     req: reqParams
@@ -1923,7 +1932,7 @@
                     data.ID = 0;
                 }
                 const res = yield api.POST(`customForm/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.CustomForm);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.CustomForm);
                 return {
                     form: res
                 };
@@ -2372,7 +2381,7 @@
                     api = exports.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;
                 }
@@ -2388,7 +2397,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -2427,7 +2436,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey({
+                const cache = api.GetCacheItem(GetListCacheKey({
                     typeIds: entityTypeIds,
                     parentTypeId,
                     expandSettings,
@@ -2493,7 +2502,7 @@
                     }
                 }));
                 if (!parentTypeId) {
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetListCacheKey({
                             typeIds: entityTypeIds,
                             parentTypeId,
@@ -4083,61 +4092,228 @@
             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 = exports.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 = exports.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 = exports.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 = exports.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;
         /**
@@ -4147,53 +4323,14 @@
          * @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 = exports.Color.RandomColor();
-                        break;
-                    case EValueType.TagColor:
-                        for (let i = 0; i < tags.length; i++) {
-                            const tag = tags[i];
-                            if (tag.Color) {
-                                value = exports.Color.ColorFromStr(tag.Color);
-                                break;
-                            }
-                        }
-                        break;
-                }
-                if (typeof value === "string") {
-                    value = exports.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;
         /**
@@ -4204,39 +4341,14 @@
          * @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;
         /**
@@ -4247,68 +4359,14 @@
          * @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 = exports.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;
         /**
@@ -4376,9 +4434,11 @@
          * 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);
@@ -5541,7 +5601,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -5556,7 +5616,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: req,
                     req: reqParams
@@ -5620,7 +5680,7 @@
                         api.Cache.Remove(GetCacheKey(attachments[i].ID));
                     }
                 }
-                yield api.Cache.Remove(GetListCacheKey(entityId));
+                api.Cache.Remove(GetListCacheKey(entityId));
                 return {
                     attachments: res.attachments
                 };
@@ -5651,7 +5711,7 @@
                 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;
@@ -5669,8 +5729,8 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 yield api.DELETE(`entity/${entityId}/attachments/${attachmentId}`, exports.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;
@@ -5688,7 +5748,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -5703,7 +5763,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(entityId),
                     value: req,
                     req: reqParams
@@ -5784,7 +5844,7 @@
                 const url = `entity/${data["TargetObject.ID"]}/comment` + (data.ID == null ? "" : "/" + data.ID);
                 const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity);
                 return {
                     comment: res
                 };
@@ -5806,7 +5866,7 @@
                 }
                 yield api.DELETE(`entity/${entityId}/comment/${commentId}`, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(commentId));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity);
             });
         }
         EntityComment.Delete = Delete;
@@ -5824,7 +5884,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -5839,7 +5899,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(entityId),
                     value: req,
                     req: reqParams
@@ -5896,7 +5956,7 @@
                 const url = `entity/${data["Entity.ID"]}/link` + (data.ID == null ? "" : "/" + data.ID);
                 const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity);
                 return {
                     link: res
                 };
@@ -5918,7 +5978,7 @@
                 }
                 yield api.DELETE(`entity/${entityId}/link/${linkId}`, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(linkId));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity);
             });
         }
         EntityLink.Delete = Delete;
@@ -5936,7 +5996,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -5951,7 +6011,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(entityId),
                     value: req,
                     req: reqParams
@@ -6034,7 +6094,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -6049,7 +6109,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(url),
                     value: req,
                     req: reqParams
@@ -6096,7 +6156,7 @@
                 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;
                 }
@@ -6112,7 +6172,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetEntityListKey(entityId),
                     value: prom,
                     req: reqParams
@@ -6134,7 +6194,7 @@
                 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;
                 }
@@ -6151,7 +6211,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetTypeListKey(typeId, group),
                     value: prom,
                     req: reqParams
@@ -6264,7 +6324,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -6279,7 +6339,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: req,
                     req: reqParams
@@ -6302,7 +6362,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -6317,7 +6377,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(id),
                     value: req,
                     req: reqParams
@@ -6413,7 +6473,7 @@
                     api = exports.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;
                 }
@@ -6428,7 +6488,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -6467,7 +6527,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -6482,7 +6542,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: req,
                     req: reqParams
@@ -6565,11 +6625,11 @@
                 };
                 const url = `entity/${data["Principal.Entity.ID"]}/relation/${data["Relation.Type.ID"]}/add`;
                 yield api.POST(url, reqData, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Principal.Entity.ID"]);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Related.Entity.ID"]);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Principal.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Related.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType);
                 if (data["Data.Entity.ID"]) {
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + data["Data.Entity.ID"]);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + data["Data.Entity.ID"]);
                 }
             });
         }
@@ -6592,9 +6652,9 @@
                     "Related.Entity.ID": [relatedEntityId]
                 }, exports.Api.PrepReqParams(reqParams));
                 // Remove related cache entries
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + principalEntityId);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + relatedEntityId);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + relationTypeId);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + principalEntityId);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + relatedEntityId);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + relationTypeId);
             });
         }
         EntityRelation.Delete = Delete;
@@ -6614,11 +6674,11 @@
                 }
                 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, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Principal.Entity.ID"]);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Related.Entity.ID"]);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + data["Relation.Type.ID"]);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Principal.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Related.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + data["Relation.Type.ID"]);
                 if (data["Data.Entity.ID"]) {
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + data["Data.Entity.ID"]);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + data["Data.Entity.ID"]);
                 }
             });
         }
@@ -6638,7 +6698,7 @@
                     api = exports.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;
                 }
@@ -6658,7 +6718,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(entityId, filter),
                     value: req,
                     req: reqParams
@@ -6681,7 +6741,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -6696,7 +6756,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetEntityCacheKey(entityId),
                     value: prom,
                     req: reqParams
@@ -6804,7 +6864,7 @@
                 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);
                     }
@@ -6900,7 +6960,7 @@
                 }
                 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
                 };
@@ -7017,7 +7077,7 @@
                                 rej(e);
                             }
                         }));
-                        yield api.SetCacheItem({
+                        api.SetCacheItem({
                             key: GetCacheKey(id),
                             value: req,
                             req: reqParams
@@ -7042,7 +7102,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -7057,7 +7117,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(entityTypeId),
                     value: req,
                     req: reqParams
@@ -7081,7 +7141,7 @@
                 }
                 yield api.DELETE(`layer/${tagId}`, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(tagId));
-                yield api.Cache.RemoveByStartsWith(GetListCacheKey());
+                api.Cache.RemoveByStartsWith(GetListCacheKey());
             });
         }
         EntityTag.Delete = Delete;
@@ -7099,7 +7159,7 @@
                 const url = data.ID ? `layer/${data.ID}` : "layer";
                 const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
-                yield api.Cache.RemoveByStartsWith(GetListCacheKey());
+                api.Cache.RemoveByStartsWith(GetListCacheKey());
                 return {
                     tag: res
                 };
@@ -7189,7 +7249,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -7204,7 +7264,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(entityId),
                     value: prom,
                     req: reqParams
@@ -7496,7 +7556,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -7511,7 +7571,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: res,
                     req: reqParams
@@ -7534,7 +7594,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -7549,7 +7609,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(id),
                     value: prom,
                     req: reqParams
@@ -8227,7 +8287,7 @@
                     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;
                 }
@@ -8242,7 +8302,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -8748,7 +8808,7 @@
                 });
                 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;
                 // }
@@ -8763,7 +8823,7 @@
                 //         rej(e);
                 //     }
                 // });
-                // await api.SetCacheItem({
+                // api.SetCacheItem({
                 //     key,
                 //     value: prom,
                 //     req: reqParams
@@ -8785,7 +8845,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -8800,7 +8860,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: req,
                     req: reqParams
@@ -9023,7 +9083,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -9043,7 +9103,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(tilesetId, loadFiles),
                     value: prom,
                     req: reqParams
@@ -9099,7 +9159,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey({
+                const cache = api.GetCacheItem(GetListCacheKey({
                     assertLocation: assertLocation,
                     expandSettings: expandSettings,
                     type: type
@@ -9139,7 +9199,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey({
                         assertLocation: assertLocation,
                         expandSettings: expandSettings,
@@ -9166,8 +9226,8 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 yield api.DELETE(`tileset/delete/${tilesetId}`, reqParams);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset + exports.Api.ECacheKey.Id + tilesetId);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset + exports.Api.ECacheKey.Id + tilesetId);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset);
             });
         }
         Tileset.Delete = Delete;
@@ -9204,8 +9264,8 @@
                         yield api.POST(`tileset/update/${data.id}`, data, exports.Api.PrepReqParams(reqParams));
                     }
                 }
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset + exports.Api.ECacheKey.Id + data.id);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset + exports.Api.ECacheKey.Id + data.id);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset);
                 return {
                     tileset: data
                 };
@@ -9490,9 +9550,9 @@
                     };
                     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(exports.Api.ECacheKey.PublishTileset + exports.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(exports.Api.ECacheKey.PublishTileset + exports.Api.ECacheKey.TilesetAccess);
                     return {
                         published: data
                     };
@@ -9508,7 +9568,7 @@
                     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;
                     }
@@ -9523,7 +9583,7 @@
                             rej(e);
                         }
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetCacheKey(accountId, tilesetId),
                         value: prom,
                         req: reqParams
@@ -9541,7 +9601,7 @@
                     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;
                     }
@@ -9556,7 +9616,7 @@
                             rej(e);
                         }
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetCacheKey(accountId),
                         value: req,
                         req: reqParams
@@ -9882,7 +9942,7 @@
                     api = exports.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;
                 }
@@ -9897,7 +9957,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -9939,7 +9999,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -9957,7 +10017,7 @@
                                     bookmark: item
                                 });
                             });
-                            yield api.SetCacheItem({
+                            api.SetCacheItem({
                                 key: GetCacheKey(viewId, item.ID),
                                 value: prom,
                                 req: reqParams
@@ -9971,7 +10031,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(viewId),
                     value: req,
                     req: reqParams
@@ -10018,7 +10078,7 @@
                     "DisplayOrder.Start": 0
                 };
                 yield api.POST(`ui.view/${viewId}/slides/setOrder`, reqData, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.RemoveByStartsWith(GetListCacheKey(viewId));
+                api.Cache.RemoveByStartsWith(GetListCacheKey(viewId));
             });
         }
         ProjectViewBookmark.SetOrder = SetOrder;
@@ -10078,7 +10138,7 @@
                     api = exports.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;
                 }
@@ -10093,7 +10153,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -10113,7 +10173,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -10128,7 +10188,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(type),
                     value: prom,
                     req: reqParams
@@ -10722,7 +10782,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -10731,7 +10791,7 @@
                         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
@@ -10745,7 +10805,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(id),
                     value: prom,
                     req: reqParams
@@ -10765,7 +10825,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -10774,7 +10834,7 @@
                         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
@@ -10788,7 +10848,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(subdomain),
                     value: prom,
                     req: reqParams
@@ -10808,7 +10868,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -10825,7 +10885,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(api.GetSessionId()),
                     value: prom,
                     req: reqParams
@@ -10845,7 +10905,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -10863,7 +10923,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(id, appId),
                     value: prom,
                     req: reqParams
@@ -10885,7 +10945,7 @@
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
                 const res = yield api.POST(`account/${id}/applicationSettings/${appId}`, data, reqParams);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + id);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + id);
                 return {
                     settings: res
                 };
@@ -11214,7 +11274,7 @@
                     api = exports.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;
                 }
@@ -11229,7 +11289,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams,
@@ -11606,13 +11666,22 @@
                 if (!api) {
                     api = exports.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
                         });
@@ -11621,8 +11690,8 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
-                    key: GetCacheKey(id, accountId),
+                api.SetCacheItem({
+                    key: cacheKey,
                     value: prom,
                     req: reqParams
                 });
@@ -11661,10 +11730,10 @@
                 const res = yield api.POST(`user/${data.ID}`, data, reqParams);
                 api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + data.ID);
                 if (data.Type == EType.AccessToken) {
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                 }
                 else if (data.Type == EType.User) {
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account);
                 }
                 return {
                     user: res
@@ -11686,7 +11755,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -11712,7 +11781,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetSettingsCacheKey(userId, appId),
                     value: prom,
                     req: req
@@ -11808,7 +11877,7 @@
                     if (!api) {
                         api = exports.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;
                     }
@@ -11823,7 +11892,7 @@
                             rej(e);
                         }
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetEmailCacheKey(email, accountId),
                         value: prom,
                         req: reqParams
@@ -11849,7 +11918,7 @@
                     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;
                     }
@@ -11867,7 +11936,7 @@
                     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]
@@ -11877,7 +11946,7 @@
                         }
                     }));
                     if (!exclusive) {
-                        yield api.SetCacheItem({
+                        api.SetCacheItem({
                             key: GetListCacheKey(accountId),
                             value: req,
                             req: reqParams
@@ -12044,7 +12113,7 @@
                     if (!api) {
                         api = exports.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;
                     }
@@ -12059,7 +12128,7 @@
                             rej(e);
                         }
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetListCacheKey(accountId),
                         value: req,
                         req: reqParams
@@ -12080,7 +12149,7 @@
                     }
                     yield api.DELETE(`accessToken/${id}`, reqParams);
                     api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + id);
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                 });
             }
             AccessToken.Delete = Delete;
@@ -12105,7 +12174,7 @@
                         data.Type = EType.AccessToken;
                     }
                     data = yield api.POST("accessToken", data, reqParams);
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                     return {
                         user: data
                     };
@@ -12309,7 +12378,7 @@
                     api = exports.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;
                 }
@@ -13322,7 +13391,7 @@
                 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;
                 }
@@ -13347,7 +13416,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(type, pageIndex),
                     value: prom,
                     req: reqParams
@@ -13367,7 +13436,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -13382,7 +13451,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKeyByRootId(rootId),
                     value: prom,
                     req: reqParams
@@ -13402,7 +13471,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -13417,7 +13486,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(fileId),
                     value: prom,
                     req: reqParams
@@ -13637,7 +13706,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -13652,7 +13721,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(pluginId),
                     value: prom,
                     req: req
@@ -13672,7 +13741,7 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -13687,7 +13756,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: prom,
                     req: req
@@ -13971,8 +14040,8 @@
                 }
                 const url = `source` + (data.ID == null ? "" : "/" + data.ID);
                 const res = yield api.POST(url, data, exports.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
                 };
@@ -13990,8 +14059,8 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 yield api.DELETE(`source/${id}`, exports.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;
@@ -14007,7 +14076,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 reqParams = exports.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;
                 }
@@ -14043,7 +14112,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 reqParams = exports.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;
                 }
@@ -14121,7 +14190,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.9.8";
+    const VERSION = "5.0.0";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;