bruce-models 1.3.7 → 1.3.9

package/dist/bruce-models.umd.js

@@ -112,10 +112,6 @@
          */
         function PrepReqParams(base) {
             base = Object.assign({}, base);
-            base.response = Object.assign({}, base.response);
-            if (!base.response.encoding) {
-                base.response.encoding = Api.EEncoding.UTF16;
-            }
             return base;
         }
         Api.PrepReqParams = PrepReqParams;
@@ -134,8 +130,9 @@
         (function (EType) {
             EType["SVG"] = "SVG";
         })(EType = AnnDocument.EType || (AnnDocument.EType = {}));
-        function Get(api, docId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, docId, req: reqParams } = params;
                 if (!docId) {
                     throw ("Doc ID is required.");
                 }
@@ -144,14 +141,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`documentView/${docId}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(key, req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`documentView/${docId}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            document: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         AnnDocument.Get = Get;
-        function GetList(api, type, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                let { api, docType: type, req: reqParams } = params;
                 if (!type) {
                     type = "";
                 }
@@ -163,7 +171,9 @@
                     try {
                         const url = "documentViews" + (type ? "?type=" + type : "");
                         const data = yield api.GET(url, exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            documents: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -193,8 +203,9 @@
             EType["Form"] = "GENERIC";
             EType["Markup"] = "MARKUP";
         })(EType = CustomForm.EType || (CustomForm.EType = {}));
-        function Get(api, id, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, formId: id, req: reqParams } = params;
                 if (!id) {
                     throw ("Id is required.");
                 }
@@ -202,14 +213,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`customForm/${id}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(GetCacheKey(id), req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`customForm/${id}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            form: data
+                        });
+                    }
+                    catch (err) {
+                        rej(err);
+                    }
+                }));
+                api.Cache.Set(GetCacheKey(id), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         CustomForm.Get = Get;
-        function Delete(api, id, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, formId: id, req: reqParams } = params;
                 if (!id) {
                     throw ("Id is required.");
                 }
@@ -218,8 +240,9 @@
             });
         }
         CustomForm.Delete = Delete;
-        function GetList(api, typeId, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityTypeId: typeId, req: reqParams } = params;
                 const url = typeId ? `entityType/${typeId}/customForms` : "customForms";
                 const cacheData = api.GetCacheItem(GetListCacheKey(typeId), reqParams);
                 if (cacheData) {
@@ -227,21 +250,26 @@
                 }
                 const req = api.GET(url, exports.Api.PrepReqParams(reqParams));
                 const prom = req.then((data) => {
-                    return data.Items;
+                    return {
+                        forms: data.Items
+                    };
                 });
                 api.Cache.Set(GetListCacheKey(typeId), prom, exports.Api.DEFAULT_CACHE_DURATION);
                 return prom;
             });
         }
         CustomForm.GetList = GetList;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, form: data, reqParams } = params;
                 if (!data.ID) {
                     data.ID = 0;
                 }
-                data = yield api.POST(`customForm/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(`customForm/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.CustomForm);
-                return data;
+                return {
+                    form: res
+                };
             });
         }
         CustomForm.Update = Update;
@@ -432,15 +460,26 @@
         }
     }
 
-    function parseResult(data, encoding) {
+    function parseResult(data) {
         return __awaiter(this, void 0, void 0, function* () {
             if (data.status == 200) {
-                if (encoding) {
-                    const buffer = yield data.arrayBuffer();
-                    return JSON.parse(new TextDecoder(encoding).decode(buffer));
+                let encoding = "";
+                const type = data.headers.get("Content-Type");
+                const charset = type ? type.split(";").find((x) => x.trim().toLowerCase().startsWith("charset=")) : "";
+                if (charset && charset.includes("=")) {
+                    encoding = charset.split("=")[1];
+                    encoding = encoding.toLowerCase();
+                }
+                // Our API has a very specific utf-16 encoding.
+                if (encoding == "utf-16") {
+                    encoding = exports.Api.EEncoding.UTF16;
+                }
+                if (!encoding || encoding == "utf-8") {
+                    return data.json();
                 }
                 else {
-                    return data.json();
+                    const buffer = yield data.arrayBuffer();
+                    return JSON.parse(new TextDecoder(encoding).decode(buffer));
                 }
             }
             else {
@@ -481,7 +520,6 @@
             this.ssidHeader = value;
         }
         get(url, params) {
-            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 if (!params) {
                     params = {};
@@ -494,11 +532,10 @@
                 const res = yield fetch(url, {
                     headers: params.headers
                 });
-                return parseResult(res, (_a = params.response) === null || _a === void 0 ? void 0 : _a.encoding);
+                return parseResult(res);
             });
         }
         delete(url, params) {
-            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 if (!params) {
                     params = {};
@@ -509,11 +546,10 @@
                     headers: params.headers,
                     method: "DELETE"
                 });
-                return parseResult(res, (_a = params.response) === null || _a === void 0 ? void 0 : _a.encoding);
+                return parseResult(res);
             });
         }
         post(url, data, params) {
-            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 if (!params) {
                     params = {};
@@ -531,11 +567,10 @@
                     method: "POST",
                     body: data
                 });
-                return parseResult(res, (_a = params.response) === null || _a === void 0 ? void 0 : _a.encoding);
+                return parseResult(res);
             });
         }
         put(url, data, params) {
-            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 if (!params) {
                     params = {};
@@ -553,7 +588,7 @@
                     method: "PUT",
                     body: data
                 });
-                return parseResult(res, (_a = params.response) === null || _a === void 0 ? void 0 : _a.encoding);
+                return parseResult(res);
             });
         }
         upload(url, blob, params) {
@@ -648,20 +683,25 @@
             EStarterContent["Default"] = "default";
             EStarterContent["None"] = "none";
         })(EStarterContent = Account.EStarterContent || (Account.EStarterContent = {}));
-        function Get(api, id, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, accountId: id, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetCacheKey(id), reqParams);
                 if (cacheData) {
                     return cacheData;
                 }
                 const req = yield api.GET(`account/${id}`, reqParams);
-                api.Cache.Set(GetCacheKey(id), req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const resData = {
+                    account: req
+                };
+                api.Cache.Set(GetCacheKey(id), resData, exports.Api.DEFAULT_CACHE_DURATION);
+                return resData;
             });
         }
         Account.Get = Get;
-        function GetRelatedList(api, reqParams) {
+        function GetRelatedList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetListCacheKey(api.GetSessionId()), reqParams);
                 if (cacheData) {
                     return cacheData;
@@ -671,7 +711,9 @@
                     try {
                         const data = yield req;
                         const items = data.Items.filter((x) => !ACCOUNT_EXCLUSIONS.includes(x.ID));
-                        res(items);
+                        res({
+                            accounts: items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -682,8 +724,9 @@
             });
         }
         Account.GetRelatedList = GetRelatedList;
-        function GetAppSettings(api, id, appId, reqParams) {
+        function GetAppSettings(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, accountId: id, appId, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetCacheKey(id, appId), reqParams);
                 if (cacheData) {
                     return cacheData;
@@ -694,7 +737,9 @@
                     try {
                         const data = yield req;
                         const settings = (_a = data === null || data === void 0 ? void 0 : data["Application.Settings"]) !== null && _a !== void 0 ? _a : {};
-                        res(settings);
+                        res({
+                            settings: settings
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -707,33 +752,28 @@
         Account.GetAppSettings = GetAppSettings;
         /**
          * WARNING: Do not update API settings without knowing what you're doing.
-         * @param api
-         * @param id
-         * @param appId
-         * @param data
-         * @param reqParams
+         * @param params
          * @returns
          */
-        function UpdateAppSettings(api, id, appId, data, reqParams) {
+        function UpdateAppSettings(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                data = yield api.POST(`account/${id}/applicationSettings/${appId}`, data, reqParams);
+                const { api, accountId: id, appId, settings: data, req: reqParams } = params;
+                const res = yield api.POST(`account/${id}/applicationSettings/${appId}`, data, reqParams);
                 api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + id);
-                return data;
+                return {
+                    settings: res
+                };
             });
         }
         Account.UpdateAppSettings = UpdateAppSettings;
         /**
          * Creates a new Bruce account using given details.
-         * @param api
-         * @param id
-         * @param name
-         * @param region
-         * @param starterContent
-         * @param reqParams
+         * @param params
          * @returns
          */
-        function Create(api, id, name, region, starterContent, reqParams) {
+        function Create(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                let { api, accountId: id, name, region, starterContent, req: reqParams } = params;
                 if (!id || !name || !region) {
                     throw new Error("Id, Name and Region are required.");
                 }
@@ -745,14 +785,18 @@
                     "DBLocation": region,
                     "StarterContent": starterContent
                 };
-                const res = api.POST(`clientAccount/${id}`, reqData, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(`clientAccount/${id}`, reqData, exports.Api.PrepReqParams(reqParams));
+                const resData = {
+                    account: res
+                };
                 api.Cache.Remove(GetListCacheKey(api.GetSessionId()));
-                return res;
+                return resData;
             });
         }
         Account.Create = Create;
-        function GetDbRegions(api, reqParams) {
+        function GetDbRegions(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetDbRegionListCacheKey(), reqParams);
                 if (cacheData) {
                     return cacheData;
@@ -760,7 +804,7 @@
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET("config/regions", exports.Api.PrepReqParams(reqParams));
-                        res(data.regions);
+                        res(data);
                     }
                     catch (e) {
                         rej(e);
@@ -971,7 +1015,11 @@
                         // Attempt to load an account specific base url.
                         // This could be one with a region specific endpoint.
                         try {
-                            const settings = yield exports.Account.GetAppSettings(cam, this.accountId, exports.Account.EAppId.BruceApi);
+                            const { settings } = yield exports.Account.GetAppSettings({
+                                api: cam,
+                                accountId: this.accountId,
+                                appId: exports.Account.EAppId.BruceApi
+                            });
                             if (this.loadCancelled) {
                                 console.warn("BruceApi: Loading was cancelled due to SetBaseUrl being called, not setting regional base url.");
                                 return;
@@ -1424,8 +1472,9 @@
             return `${exports.Api.ECacheKey.Entity}${exports.Api.ECacheKey.Id}${entityId}`;
         }
         Entity.GetCacheKey = GetCacheKey;
-        function Get(api, entityId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, req: reqParams } = params;
                 if (!entityId) {
                     throw ("Entity ID is required.");
                 }
@@ -1434,14 +1483,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`entity/${entityId}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(key, req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`entity/${entityId}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            entity: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         Entity.Get = Get;
-        function GetListByIds(api, entityIds, reqParams) {
+        function GetListByIds(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityIds, req: reqParams } = params;
                 if (!entityIds.length) {
                     throw ("Entity IDs are required.");
                 }
@@ -1475,7 +1535,9 @@
                             try {
                                 const data = yield req;
                                 const item = data.Items.find(x => x.Bruce.ID == entityId);
-                                res(item);
+                                res({
+                                    entity: item
+                                });
                             }
                             catch (e) {
                                 // No showing error as we don't want to see it 2000 times.
@@ -1486,12 +1548,15 @@
                         reqs.push(prom);
                     }
                 }
-                return (yield Promise.all(reqs)).filter(x => !!x);
+                return {
+                    entities: (yield Promise.all(reqs)).map(x => x === null || x === void 0 ? void 0 : x.entity).filter(x => !!x)
+                };
             });
         }
         Entity.GetListByIds = GetListByIds;
-        function Delete(api, entityId, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, req: reqParams } = params;
                 if (!entityId) {
                     throw ("Entity ID is required.");
                 }
@@ -1500,8 +1565,9 @@
             });
         }
         Entity.Delete = Delete;
-        function DeleteList(api, entityIds, reqParams) {
+        function DeleteList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityIds, req: reqParams } = params;
                 if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
                     throw ("Entity IDs are required.");
                 }
@@ -1515,9 +1581,10 @@
             });
         }
         Entity.DeleteList = DeleteList;
-        function Update(api, data, override, reqParams) {
+        function Update(params) {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entity: data, override, req: reqParams } = params;
                 if (!((_a = data === null || data === void 0 ? void 0 : data.Bruce) === null || _a === void 0 ? void 0 : _a["EntityType.ID"])) {
                     throw ("Entity Type ID is required.");
                 }
@@ -1525,14 +1592,17 @@
                     data.Bruce = Object.assign(Object.assign({}, data.Bruce), { ID: exports.ObjectUtils.UId() });
                 }
                 const reqUrl = `entity/${data.Bruce.ID}/?dataoverride=${override}&BruceEntityType=${data.Bruce["EntityType.ID"]}`;
-                data = yield api.POST(reqUrl, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(reqUrl, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.Bruce.ID));
-                return data;
+                return {
+                    entity: res
+                };
             });
         }
         Entity.Update = Update;
-        function RemoveTag(data, tagId) {
+        function RemoveTag(params) {
             var _a;
+            const { entity: data, tagId } = params;
             const tags = (_a = data.Bruce["Layer.ID"]) !== null && _a !== void 0 ? _a : [];
             const index = tags.indexOf(tagId);
             if (index >= 0) {
@@ -1541,8 +1611,9 @@
             }
         }
         Entity.RemoveTag = RemoveTag;
-        function AddTag(data, tagId) {
+        function AddTag(params) {
             var _a;
+            const { entity: data, tagId } = params;
             const tags = (_a = data.Bruce["Layer.ID"]) !== null && _a !== void 0 ? _a : [];
             if (!tags.includes(tagId)) {
                 tags.push(tagId);
@@ -1550,7 +1621,8 @@
             }
         }
         Entity.AddTag = AddTag;
-        function SetValue(data, path, value) {
+        function SetValue(params) {
+            const { entity: data, path, value } = params;
             let curData = data;
             for (let i = 0; i < path.length; i++) {
                 const step = path[i];
@@ -1565,8 +1637,9 @@
             }
         }
         Entity.SetValue = SetValue;
-        function GetValue(data, path) {
+        function GetValue(params) {
             var _a;
+            const { entity: data, path } = params;
             // Backwards compatibility.
             if (path.length == 1 && path[0] == "ID") {
                 return (_a = data.Bruce) === null || _a === void 0 ? void 0 : _a.ID;
@@ -1587,21 +1660,23 @@
         Entity.GetValue = GetValue;
         /**
          * Calculates an entity's name based on attribute priority set in the type.
-         * @param entity
-         * @param type
-         * @param defaultToId
+         * @param params
          * If true, will return the entity ID if no name can be calculated.
          * Otherwise it returns null.
          * @returns
          */
-        function CalculateName(entity, type, defaultToId) {
+        function CalculateName(params) {
+            const { entity, type, defaultToId = true } = params;
             const attrStr = type.DisplayNameAttributePath;
             if (attrStr) {
                 const attrPaths = attrStr.split(",");
                 for (let i = 0; i < attrPaths.length; i++) {
                     const pathStr = attrPaths[i];
                     const path = exports.PathUtils.Parse(pathStr);
-                    const name = Entity.GetValue(entity, path);
+                    const name = Entity.GetValue({
+                        entity: entity,
+                        path
+                    });
                     if (name && typeof name != "object") {
                         return name;
                     }
@@ -1610,54 +1685,52 @@
             return defaultToId ? entity.Bruce.ID : null;
         }
         Entity.CalculateName = CalculateName;
-        let Filter;
-        (function (Filter) {
-            let V1;
-            (function (V1) {
-                function GetList(api, filter, reqParams) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        let requestFilter = {};
-                        if (filter.entityTypeConditions) {
-                            requestFilter = Object.assign({}, filter.entityTypeConditions);
-                        }
-                        if (filter.layerIds != null && filter.layerIds.length > 0) {
-                            requestFilter["Bruce.Layer.ID"] = {
-                                equals: filter.layerIds
-                            };
-                        }
-                        if (filter.bounds) {
-                            requestFilter["geometry"] = {
-                                "intersects": [
-                                    filter.bounds.south,
-                                    filter.bounds.north,
-                                    filter.bounds.west,
-                                    filter.bounds.east
-                                ]
-                            };
-                        }
-                        const body = {
-                            SortOrder: filter.sortOrder == exports.Api.ESortOrder.Asc ? "ASC" : "DESC",
-                            OrderBy: filter.orderBy,
-                            Filter: requestFilter,
-                            LODType: filter.lodCategoryId,
-                            BruceEntityType: filter.entityTypeId,
-                            PageIndex: filter.pageIndex,
-                            PageSize: filter.pageSize
-                        };
-                        const data = yield api.POST("entities", body, exports.Api.PrepReqParams(reqParams));
-                        const entities = data.Items;
-                        for (let i = 0; i < entities.length; i++) {
-                            const entity = entities[i];
-                            const id = entity.Bruce.ID;
-                            api.Cache.Set(GetCacheKey(id), entity, exports.Api.DEFAULT_CACHE_DURATION);
-                        }
-                        return entities;
-                    });
+        function GetList(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { api, filter, req: reqParams } = params;
+                let requestFilter = {};
+                if (filter.entityTypeConditions) {
+                    requestFilter = Object.assign({}, filter.entityTypeConditions);
+                }
+                if (filter.layerIds != null && filter.layerIds.length > 0) {
+                    requestFilter["Bruce.Layer.ID"] = {
+                        equals: filter.layerIds
+                    };
                 }
-                V1.GetList = GetList;
-            })(V1 = Filter.V1 || (Filter.V1 = {}));
-            // TODO: Helpers for constructing the filter.
-        })(Filter = Entity.Filter || (Entity.Filter = {}));
+                if (filter.bounds) {
+                    requestFilter["geometry"] = {
+                        "intersects": [
+                            filter.bounds.south,
+                            filter.bounds.north,
+                            filter.bounds.west,
+                            filter.bounds.east
+                        ]
+                    };
+                }
+                const body = {
+                    SortOrder: filter.sortOrder == exports.Api.ESortOrder.Asc ? "ASC" : "DESC",
+                    OrderBy: filter.orderBy,
+                    Filter: requestFilter,
+                    LODType: filter.lodCategoryId,
+                    BruceEntityType: filter.entityTypeId,
+                    PageIndex: filter.pageIndex,
+                    PageSize: filter.pageSize
+                };
+                const data = yield api.POST("entities", body, exports.Api.PrepReqParams(reqParams));
+                const entities = data.Items;
+                for (let i = 0; i < entities.length; i++) {
+                    const entity = entities[i];
+                    const id = entity.Bruce.ID;
+                    api.Cache.Set(GetCacheKey(id), {
+                        entity: entity
+                    }, exports.Api.DEFAULT_CACHE_DURATION);
+                }
+                return {
+                    entities: entities
+                };
+            });
+        }
+        Entity.GetList = GetList;
     })(exports.Entity || (exports.Entity = {}));
 
     function getVariable(str) {
@@ -1680,7 +1753,8 @@
          * @param legacyParse
          * @returns
          */
-        function SwapValues(str, data, legacyParse) {
+        function SwapValues(params) {
+            let { str, entity: data, legacyParse } = params;
             if (!legacyParse) {
                 legacyParse = false;
             }
@@ -1690,7 +1764,10 @@
                     const path = legacyParse ? exports.PathUtils.ParseLegacy(variable.path) : exports.PathUtils.Parse(variable.path);
                     let value = "";
                     if (path.length > 0) {
-                        value = exports.Entity.GetValue(data, path);
+                        value = exports.Entity.GetValue({
+                            entity: data,
+                            path: path
+                        });
                     }
                     str = str.replace(variable.text, value);
                 }
@@ -1840,7 +1917,10 @@
         Calculator.GetColor = GetColor;
         function GetMappingValue(value, entity) {
             const attrPath = parseLegacyPath(value.field);
-            const eValue = exports.Entity.GetValue(entity, attrPath);
+            let eValue = exports.Entity.GetValue({
+                entity: entity,
+                path: attrPath
+            });
             const isValueNum = !isNaN(+eValue);
             for (let i = 0; i < value.values.length; i++) {
                 const option = value.values[i];
@@ -1881,7 +1961,10 @@
         Calculator.GetMappingValue = GetMappingValue;
         function GetGradientValue(value, entity) {
             const attrPath = parseLegacyPath(value.field);
-            let eValue = exports.Entity.GetValue(entity, attrPath);
+            let eValue = exports.Entity.GetValue({
+                entity: entity,
+                path: attrPath
+            });
             eValue = Math.min(Math.max(eValue, value.min), value.max);
             if (eValue < value.points[0].position) {
                 return exports.Color.ColorFromStr(value.points[0].color);
@@ -1910,7 +1993,10 @@
         function GetInputValue(value, entity) {
             if (typeof value == "string") {
                 try {
-                    value = exports.BruceVariable.SwapValues(value, entity);
+                    value = exports.BruceVariable.SwapValues({
+                        str: value,
+                        entity: entity
+                    });
                     const eval2 = eval; // https://rollupjs.org/guide/en/#avoiding-eval
                     return eval2(value);
                 }
@@ -1977,17 +2063,17 @@
             return filteredList;
         }
         Geometry.RemoveRepeatPoints = RemoveRepeatPoints;
-        function ParsePoints(data) {
-            data = data.replace(/[^\d.,-\s]/g, "");
+        function ParsePoints(pointsStr) {
+            pointsStr = pointsStr.replace(/[^\d.,-\s]/g, "");
             let splitterCoordinates = " ";
             let splitterAxis = ",";
-            const commaIndex = data.indexOf(",");
-            const spaceIndex = data.indexOf(" ");
+            const commaIndex = pointsStr.indexOf(",");
+            const spaceIndex = pointsStr.indexOf(" ");
             if ((spaceIndex > -1 && commaIndex > spaceIndex) || commaIndex <= -1) {
                 splitterCoordinates = ",";
                 splitterAxis = " ";
             }
-            let points = data.trim().split(splitterCoordinates);
+            let points = pointsStr.trim().split(splitterCoordinates);
             points = points.filter(a => a != "");
             const result = [];
             for (let i = 0; i < points.length; i++) {
@@ -2436,8 +2522,9 @@
             EType["Photo"] = "photo";
             EType["Document"] = "document";
         })(EType = EntityAttachmentType.EType || (EntityAttachmentType.EType = {}));
-        function Delete(api, id, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, attachmentTypeId: id, req: reqParams } = params;
                 if (!id) {
                     throw ("Type ID is required.");
                 }
@@ -2447,20 +2534,24 @@
             });
         }
         EntityAttachmentType.Delete = Delete;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, attachmentType: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data.ID)) {
                     throw ("Type ID is required.");
                 }
-                data = yield api.POST(`entityAttachmentType/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(`entityAttachmentType/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
                 api.Cache.Remove(GetListCacheKey());
-                return data;
+                return {
+                    attachmentType: res
+                };
             });
         }
         EntityAttachmentType.Update = Update;
-        function GetList(api, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, reqParams } = params;
                 const cacheData = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cacheData) {
                     return cacheData;
@@ -2468,7 +2559,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET(`entityAttachmentTypes`, exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            attachmentTypes: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -2490,21 +2583,25 @@
             return exports.Api.ECacheKey.Attachment + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
         }
         EntityAttachment.GetListCacheKey = GetListCacheKey;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, attachment: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data["Entity.ID"]) || !(data === null || data === void 0 ? void 0 : data["EntityAttachmentType.ID"]) || !(data === null || data === void 0 ? void 0 : data["ClientFile.ID"])) {
                     throw ("Entity ID, Type ID, and File ID are required.");
                 }
                 const url = `entity/${data["Entity.ID"]}/attachment/${data.oldAttachmentTypeId}/${data["ClientFile.ID"]}`;
-                data = yield api.PUT(url, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.PUT(url, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data["Entity.ID"], data["EntityAttachmentType.ID"], data["ClientFile.ID"]));
                 api.Cache.RemoveByStartsWith(GetListCacheKey(data["Entity.ID"]));
-                return data;
+                return {
+                    attachment: res
+                };
             });
         }
         EntityAttachment.Update = Update;
-        function UpdateOrder(api, entityId, typeId, fileIds, reqParams) {
+        function UpdateOrder(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, attachmentTypeId: typeId, fileIds, req: reqParams } = params;
                 if (!entityId || !typeId || !(fileIds === null || fileIds === void 0 ? void 0 : fileIds.length)) {
                     throw ("Entity ID, Type ID, and File IDs are required.");
                 }
@@ -2520,8 +2617,9 @@
             });
         }
         EntityAttachment.UpdateOrder = UpdateOrder;
-        function Delete(api, data, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, attachment: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data["Entity.ID"]) || !(data === null || data === void 0 ? void 0 : data["EntityAttachmentType.ID"]) || !(data === null || data === void 0 ? void 0 : data["ClientFile.ID"])) {
                     throw ("Entity ID, Type ID, and File ID are required.");
                 }
@@ -2534,8 +2632,9 @@
             });
         }
         EntityAttachment.Delete = Delete;
-        function DeleteByFileIds(api, entityId, typeId, fileIds, reqParams) {
+        function DeleteByFileIds(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, attachmentTypeId: typeId, fileIds, req: reqParams } = params;
                 if (!entityId || !typeId || !(fileIds === null || fileIds === void 0 ? void 0 : fileIds.length)) {
                     throw ("Entity ID, Type ID, and File IDs are required.");
                 }
@@ -2550,8 +2649,9 @@
             });
         }
         EntityAttachment.DeleteByFileIds = DeleteByFileIds;
-        function GetListByEntityId(api, entityId, reqParams) {
+        function GetListByEntityId(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, req: reqParams } = params;
                 if (!entityId) {
                     throw ("Entity ID is required.");
                 }
@@ -2562,7 +2662,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET(`entity/${entityId}/attachments`, exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            attachments: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -2573,15 +2675,18 @@
             });
         }
         EntityAttachment.GetListByEntityId = GetListByEntityId;
-        function Upload(api, file, entityId, typeId, reqParams) {
+        function Upload(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, file, entityId, attachmentTypeId: typeId, req: reqParams } = params;
                 if (!entityId || !typeId || !file) {
                     throw ("Entity ID, Type ID, and File are required.");
                 }
                 const url = `entity/${entityId}/attachment/${typeId}`;
-                const req = yield api.UPLOAD(url, file, reqParams);
+                const res = yield api.UPLOAD(url, file, reqParams);
                 api.Cache.RemoveByStartsWith(GetListCacheKey(entityId));
-                return req;
+                return {
+                    attachment: res
+                };
             });
         }
         EntityAttachment.Upload = Upload;
@@ -2596,21 +2701,25 @@
             return exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
         }
         EntityComment.GetListCacheKey = GetListCacheKey;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, comment: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data["TargetObject.ID"])) {
                     throw ("TargetObject.ID (entity id) is required.");
                 }
                 const url = `entity/${data["TargetObject.ID"]}/comment` + (data.ID == null ? "" : "/" + data.ID);
-                data = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
                 api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity);
-                return data;
+                return {
+                    comment: res
+                };
             });
         }
         EntityComment.Update = Update;
-        function Delete(api, entityId, commentId, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, commentId, req: reqParams } = params;
                 if (!commentId) {
                     throw ("Comment ID is required.");
                 }
@@ -2620,8 +2729,9 @@
             });
         }
         EntityComment.Delete = Delete;
-        function GetListByEntityId(api, entityId, reqParams) {
+        function GetListByEntityId(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, req: reqParams } = params;
                 if (!entityId) {
                     throw ("Entity ID is required.");
                 }
@@ -2632,7 +2742,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET(`entity/${entityId}/comments`, exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            comments: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -2654,21 +2766,25 @@
             return exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
         }
         EntityLink.GetListCacheKey = GetListCacheKey;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, link: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data["Entity.ID"])) {
                     throw ("Entity ID is required.");
                 }
                 const url = `entity/${data["Entity.ID"]}/link` + (data.ID == null ? "" : "/" + data.ID);
-                data = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
                 api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity);
-                return data;
+                return {
+                    link: res
+                };
             });
         }
         EntityLink.Update = Update;
-        function Delete(api, entityId, linkId, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, linkId, req: reqParams } = params;
                 if (!linkId) {
                     throw ("Link ID is required.");
                 }
@@ -2678,8 +2794,9 @@
             });
         }
         EntityLink.Delete = Delete;
-        function GetListByEntityId(api, entityId, reqParams) {
+        function GetListByEntityId(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, req: reqParams } = params;
                 if (!entityId) {
                     throw ("Entity ID is required.");
                 }
@@ -2690,7 +2807,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET(`entity/${entityId}/links`, exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            links: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -2716,7 +2835,8 @@
             return exports.Api.ECacheKey.Lod + exports.Api.ECacheKey.Entity + entityId;
         }
         EntityLod.GetEntityListKey = GetEntityListKey;
-        function GetUrl(api, entityId, categoryId, level, strict) {
+        function GetUrl(params) {
+            let { api, entityId, categoryId, level, strict } = params;
             if (!entityId) {
                 throw ("Entity ID is required.");
             }
@@ -2730,11 +2850,14 @@
             if (strict) {
                 url = url + "?strict=true";
             }
-            return url;
+            return {
+                url: url
+            };
         }
         EntityLod.GetUrl = GetUrl;
-        function GetUrlFileId(api, url, reqParams) {
+        function GetUrlFileId(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, url, req: reqParams } = params;
                 if (!url) {
                     throw ("Url is required.");
                 }
@@ -2745,7 +2868,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const record = yield api.get(url, exports.Api.PrepReqParams(reqParams));
-                        res(record["ClientFile.ID"]);
+                        res({
+                            clientFileId: record["ClientFile.ID"]
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -2756,19 +2881,23 @@
             });
         }
         EntityLod.GetUrlFileId = GetUrlFileId;
-        function GetLods(api, params, reqParams) {
+        function GetLods(params) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
-                if (!((_a = params === null || params === void 0 ? void 0 : params.Items) === null || _a === void 0 ? void 0 : _a.length)) {
+                const { api, filter, req: reqParams } = params;
+                if (!((_a = filter === null || filter === void 0 ? void 0 : filter.Items) === null || _a === void 0 ? void 0 : _a.length)) {
                     throw ("Items are required.");
                 }
-                const data = yield api.POST("entity/getlods", params, reqParams);
-                return data.Items;
+                const data = yield api.POST("entity/getlods", filter, reqParams);
+                return {
+                    lods: data.Items
+                };
             });
         }
         EntityLod.GetLods = GetLods;
-        function GetEntityLods(api, entityId, reqParams) {
+        function GetEntityLods(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, req: reqParams } = params;
                 if (!entityId) {
                     throw ("Entity id is required.");
                 }
@@ -2780,7 +2909,9 @@
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield req;
-                        res(data.Items);
+                        res({
+                            lods: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -2793,13 +2924,11 @@
         EntityLod.GetEntityLods = GetEntityLods;
         /**
          * Returns lods for a specified entity type.
-         * @param api
-         * @param typeId
-         * @param group default is "DEFAULT".
-         * @param reqParams
+         * @param params
          */
-        function GetTypeLods(api, typeId, group, reqParams) {
+        function GetTypeLods(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                let { api, entityTypeId: typeId, group, req: reqParams } = params;
                 if (!group) {
                     group = "DEFAULT";
                 }
@@ -2812,7 +2941,9 @@
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield req;
-                        res(data.Items);
+                        res({
+                            lods: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -2823,8 +2954,9 @@
             });
         }
         EntityLod.GetTypeLods = GetTypeLods;
-        function Update(api, entityId, params, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, req: reqParams } = params;
                 if (!params["ClientFile.ID"] || !params["LODCategory.Key"] || (!params.Level && params.Level !== 0)) {
                     throw ("ClientFile.ID, LODCategory.Key and Level are required.");
                 }
@@ -2837,8 +2969,9 @@
             });
         }
         EntityLod.Update = Update;
-        function Delete(api, entityId, lodCategoryId, level, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                let { api, entityId, lodCategoryId, level, req: reqParams } = params;
                 if (!entityId || !lodCategoryId) {
                     throw ("Entity ID and LOD Category ID are required.");
                 }
@@ -2864,8 +2997,9 @@
             return exports.Api.ECacheKey.LodCategory;
         }
         EntityLodCategory.GetListCacheKey = GetListCacheKey;
-        function GetList(api, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, req: reqParams } = params;
                 const cacheKey = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cacheKey) {
                     return cacheKey;
@@ -2873,7 +3007,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET("lodCategories", exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            categories: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -2884,8 +3020,9 @@
             });
         }
         EntityLodCategory.GetList = GetList;
-        function Get(api, id, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, categoryId: id, req: reqParams } = params;
                 if (!id) {
                     throw ("Lod category id is required.");
                 }
@@ -2896,7 +3033,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET(`lodCategory/${id}`, exports.Api.PrepReqParams(reqParams));
-                        res(data);
+                        res({
+                            category: data
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -2907,8 +3046,9 @@
             });
         }
         EntityLodCategory.Get = Get;
-        function Delete(api, id, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, categoryId: id, req: reqParams } = params;
                 if (!id) {
                     throw ("Lod category id is required.");
                 }
@@ -2918,15 +3058,18 @@
             });
         }
         EntityLodCategory.Delete = Delete;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, category: data, req: reqParams } = params;
                 if (!data.Key || !data.Name) {
                     throw ("Lod category key and name are required.");
                 }
-                data = yield api.POST(`lodCategory/${data.Key}`, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(`lodCategory/${data.Key}`, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.Key));
                 api.Cache.Remove(GetListCacheKey());
-                return data;
+                return {
+                    category: res
+                };
             });
         }
         EntityLodCategory.Update = Update;
@@ -2941,8 +3084,9 @@
             return exports.Api.ECacheKey.RelationType;
         }
         EntityRelationType.GetListCacheKey = GetListCacheKey;
-        function Get(api, typeId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, relationTypeId: typeId, req: reqParams } = params;
                 if (!typeId) {
                     throw ("Type ID is required.");
                 }
@@ -2951,14 +3095,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`entityRelationType/${typeId}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(key, req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`entityRelationType/${typeId}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            relationType: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         EntityRelationType.Get = Get;
-        function Delete(api, typeId, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, relationTypeId: typeId, req: reqParams } = params;
                 if (!typeId) {
                     throw ("Type ID is required.");
                 }
@@ -2968,8 +3123,9 @@
             });
         }
         EntityRelationType.Delete = Delete;
-        function GetList(api, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cacheData) {
                     return cacheData;
@@ -2977,7 +3133,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET("entityRelationTypes", exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            relationTypes: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -2988,18 +3146,21 @@
             });
         }
         EntityRelationType.GetList = GetList;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, relationType: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data.ForwardName) || !(data === null || data === void 0 ? void 0 : data.ReverseName)) {
                     throw ("Forward and reverse names are required.");
                 }
                 if (!data.ID) {
                     data.ID = exports.ObjectUtils.UId();
                 }
-                data = yield api.POST(`entityRelationType/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(`entityRelationType/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
                 api.Cache.Remove(GetListCacheKey());
-                return data;
+                return {
+                    relationType: res
+                };
             });
         }
         EntityRelationType.Update = Update;
@@ -3016,14 +3177,15 @@
         EntityRelation.GetEntityCacheKey = GetEntityCacheKey;
         function GetListCacheKey(entityId, params) {
             return exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType +
-                exports.Api.ECacheKey.Id + params.typeId +
+                exports.Api.ECacheKey.Id + params.relationTypeId +
                 exports.Api.ECacheKey.Id + params.oneWayOnly +
                 exports.Api.ECacheKey.Id + params.loadEntityData +
                 exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
         }
         EntityRelation.GetListCacheKey = GetListCacheKey;
-        function Create(api, data, reqParams) {
+        function Create(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, relation: data, req: reqParams } = params;
                 if (!data["Principal.Entity.ID"] || !data["Related.Entity.ID"] || !data["Relation.Type.ID"]) {
                     throw ("Principal Entity ID, Related Entity ID, and Relation Type ID are required.");
                 }
@@ -3041,54 +3203,61 @@
             });
         }
         EntityRelation.Create = Create;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, relation: data, req: reqParams } = params;
                 if (!data["Principal.Entity.ID"] || !data["Related.Entity.ID"] || !data["Relation.Type.ID"]) {
                     throw ("Principal Entity ID, Related Entity ID, and Relation Type ID are required.");
                 }
                 const url = `entity/${data["Principal.Entity.ID"]}/otherEntityID/${data["Related.Entity.ID"]}/relation/${data["Relation.Type.ID"]}/update`;
-                data = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
                 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"]) {
                     api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + data["Data.Entity.ID"]);
                 }
-                return data;
+                return {
+                    relation: res
+                };
             });
         }
         EntityRelation.Update = Update;
-        function GetList(api, entityId, params, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                let { api, entityId, filter, req: reqParams } = params;
                 if (!entityId) {
                     throw ("Entity ID is required.");
                 }
-                params = Object.assign({ typeId: "", oneWayOnly: false, loadEntityData: false }, params);
-                const cacheData = api.GetCacheItem(GetListCacheKey(entityId, params), reqParams);
+                filter = Object.assign({ relationTypeId: "", oneWayOnly: false, loadEntityData: false }, filter);
+                const cacheData = api.GetCacheItem(GetListCacheKey(entityId, filter), reqParams);
                 if (cacheData) {
                     return cacheData;
                 }
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         let url = `entity/${entityId}/relations`;
-                        if (params.typeId) {
-                            url += "/" + params.typeId;
+                        if (filter.relationTypeId) {
+                            url += "/" + filter.relationTypeId;
                         }
-                        url += `?Oneway=${params.oneWayOnly}&LoadInfo=${params.loadEntityData}`;
+                        url += `?Oneway=${filter.oneWayOnly}&LoadInfo=${filter.loadEntityData}`;
                         const data = yield api.GET(url, exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            relations: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityId, params), req);
+                api.Cache.Set(GetListCacheKey(entityId, filter), req);
                 return req;
             });
         }
         EntityRelation.GetList = GetList;
-        function GetByDataEntityId(api, entityId, reqParams) {
+        function GetByDataEntityId(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityId, req: reqParams } = params;
                 if (!entityId) {
                     throw ("Entity ID is required.");
                 }
@@ -3096,9 +3265,19 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`entity/relation/${entityId}/dataentity`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(GetEntityCacheKey(entityId), req);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`entity/relation/${entityId}/dataentity`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            relation: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(GetEntityCacheKey(entityId), prom);
+                return prom;
             });
         }
         EntityRelation.GetByDataEntityId = GetByDataEntityId;
@@ -3109,8 +3288,9 @@
             return `${exports.Api.ECacheKey.EntitySource}${exports.Api.ECacheKey.Id}${sourceId}${exports.Api.ECacheKey.Id}${sourceKey}`;
         }
         EntitySource.GetCacheKey = GetCacheKey;
-        function Get(api, sourceId, sourceKey, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, sourceId, sourceKey, req: reqParams } = params;
                 if (!sourceId || !sourceKey) {
                     throw ("Source ID and Source Key are required.");
                 }
@@ -3119,14 +3299,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`entitysource/${sourceId}/${sourceKey}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(key, req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`entitysource/${sourceId}/${sourceKey}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            source: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         EntitySource.Get = Get;
-        function GetListByKeys(api, sourceId, sourceKeys, reqParams) {
+        function GetListByKeys(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, sourceId, sourceKeys, req: reqParams } = params;
                 if (!sourceId || !sourceKeys.length) {
                     throw ("Source ID and Source Keys are required.");
                 }
@@ -3165,18 +3356,26 @@
                         reqs.push(req);
                     }
                 }
-                return (yield Promise.all(reqs)).filter(x => !!x);
+                return {
+                    sources: (yield Promise.all(reqs)).filter(x => !!x)
+                };
             });
         }
         EntitySource.GetListByKeys = GetListByKeys;
-        function GetEntityIdsBySourceKeys(api, sourceId, sourceKeys, reqParams) {
+        function GetEntityIdsBySourceKeys(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, sourceId, sourceKeys, req: reqParams } = params;
                 if (!sourceId || !sourceKeys.length) {
                     throw ("Source ID and Source Keys are required.");
                 }
                 const result = {};
                 if (sourceKeys.length > 0) {
-                    const sources = yield GetListByKeys(api, sourceId, sourceKeys, reqParams);
+                    const { sources } = yield GetListByKeys({
+                        api,
+                        sourceId,
+                        sourceKeys,
+                        req: reqParams
+                    });
                     for (let i = 0; i < sources.length; i++) {
                         const source = sources[i];
                         for (let i = 0; i < sourceKeys.length; i++) {
@@ -3187,7 +3386,9 @@
                         }
                     }
                 }
-                return result;
+                return {
+                    idMapping: result
+                };
             });
         }
         EntitySource.GetEntityIdsBySourceKeys = GetEntityIdsBySourceKeys;
@@ -3205,18 +3406,26 @@
             return exports.Api.ECacheKey.Tag;
         }
         EntityTag.GetListCacheKey = GetListCacheKey;
-        function Get(api, tagId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tagId, req: reqParams } = params;
                 if (!tagId) {
                     throw ("Tag ID is required.");
                 }
-                const data = yield GetListByIds(api, [tagId], reqParams);
-                return data.length ? data[0] : null;
+                const { tags } = yield GetListByIds({
+                    api,
+                    tagIds: [tagId],
+                    req: reqParams
+                });
+                return {
+                    tag: tags.length ? tags[0] : null
+                };
             });
         }
         EntityTag.Get = Get;
-        function GetListByIds(api, tagIds, reqParams) {
+        function GetListByIds(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tagIds, req: reqParams } = params;
                 if (!tagIds.length) {
                     throw ("Tag Ids are empty.");
                 }
@@ -3258,12 +3467,15 @@
                         reqs.push(req);
                     }
                 }
-                return (yield Promise.all(reqs)).filter(x => !!x);
+                return {
+                    tags: (yield Promise.all(reqs)).filter(x => !!x)
+                };
             });
         }
         EntityTag.GetListByIds = GetListByIds;
-        function GetList(api, entityTypeId, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityTypeId, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetListCacheKey(entityTypeId), reqParams);
                 if (cacheData) {
                     return cacheData;
@@ -3271,7 +3483,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET(entityTypeId ? `entityType/${entityTypeId}/layers` : "layers", exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            tags: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -3282,8 +3496,9 @@
             });
         }
         EntityTag.GetList = GetList;
-        function Delete(api, tagId, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tagId, req: reqParams } = params;
                 if (!tagId) {
                     throw ("Tag ID is required.");
                 }
@@ -3293,16 +3508,19 @@
             });
         }
         EntityTag.Delete = Delete;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tag: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data.ID)) {
                     throw ("Tag ID is required.");
                 }
                 const url = data.ID ? `layer/${data.ID}` : "layer";
-                data = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
                 api.Cache.RemoveByStartsWith(GetListCacheKey());
-                return data;
+                return {
+                    tag: res
+                };
             });
         }
         EntityTag.Update = Update;
@@ -3317,8 +3535,9 @@
             return exports.Api.ECacheKey.EntityType;
         }
         EntityType.GetListCacheKey = GetListCacheKey;
-        function Get(api, typeId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityTypeId: typeId, req: reqParams } = params;
                 if (!typeId) {
                     throw ("Type ID is required.");
                 }
@@ -3327,14 +3546,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`entitytype/${typeId}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(key, req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`entitytype/${typeId}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            entityType: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         EntityType.Get = Get;
-        function Delete(api, typeId, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, entityTypeId: typeId, req: reqParams } = params;
                 if (!typeId) {
                     throw ("Type ID is required.");
                 }
@@ -3344,8 +3574,9 @@
             });
         }
         EntityType.Delete = Delete;
-        function GetList(api, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cacheData) {
                     return cacheData;
@@ -3353,7 +3584,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET("entitytypes", exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            entityTypes: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -3364,8 +3597,9 @@
             });
         }
         EntityType.GetList = GetList;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                let { api, entityType: data, req: reqParams } = params;
                 if (!data) {
                     data = {};
                 }
@@ -3375,10 +3609,12 @@
                 if (!data.Name) {
                     data.Name = data.ID;
                 }
-                data = yield api.POST(`entitytype/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(`entitytype/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
                 api.Cache.Remove(GetListCacheKey());
-                return data;
+                return {
+                    entityType: res
+                };
             });
         }
         EntityType.Update = Update;
@@ -3777,18 +4013,21 @@
                             continue;
                         }
                         try {
-                            const page = yield exports.Entity.Filter.V1.GetList(this.api, {
-                                pageSize: PAGE_SIZE,
-                                pageIndex: curCell.FetchPageIndex,
-                                entityTypeId: this.typeId,
-                                layerIds: this.tagIds,
-                                bounds: curCell.GetBounds(),
-                                sortOrder: exports.Api.ESortOrder.Asc,
-                                entityTypeConditions: this.attrFilter
+                            const { entities } = yield exports.Entity.GetList({
+                                api: this.api,
+                                filter: {
+                                    pageSize: PAGE_SIZE,
+                                    pageIndex: curCell.FetchPageIndex,
+                                    entityTypeId: this.typeId,
+                                    layerIds: this.tagIds,
+                                    bounds: curCell.GetBounds(),
+                                    sortOrder: exports.Api.ESortOrder.Asc,
+                                    entityTypeConditions: this.attrFilter
+                                }
                             });
                             const integrity = this.getIntegrityId();
-                            if (loopIntegrity == integrity && page) {
-                                (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger(page);
+                            if (loopIntegrity == integrity && entities) {
+                                (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger(entities);
                             }
                             if (this.getterLoopId != loopId) {
                                 break;
@@ -3798,15 +4037,15 @@
                                 postedLoading = true;
                             }
                             // Only mark as fetched when ALL pages are done.
-                            if (page.length <= 0) {
+                            if (entities.length <= 0) {
                                 curCell.Fetched = true;
                                 (_d = this.onScanUpdate) === null || _d === void 0 ? void 0 : _d.Trigger(cells);
                                 continue;
                             }
                             // Checking to make sure it's not just the same batch over and over again.
-                            if (page.length > 0) {
-                                const first = (_f = (_e = page[0]) === null || _e === void 0 ? void 0 : _e.Bruce) === null || _f === void 0 ? void 0 : _f.ID;
-                                const last = (_h = (_g = page[page.length - 1]) === null || _g === void 0 ? void 0 : _g.Bruce) === null || _h === void 0 ? void 0 : _h.ID;
+                            if (entities.length > 0) {
+                                const first = (_f = (_e = entities[0]) === null || _e === void 0 ? void 0 : _e.Bruce) === null || _f === void 0 ? void 0 : _f.ID;
+                                const last = (_h = (_g = entities[entities.length - 1]) === null || _g === void 0 ? void 0 : _g.Bruce) === null || _h === void 0 ? void 0 : _h.ID;
                                 if (prevFirstId == first && prevLastId == last) {
                                     break;
                                 }
@@ -3959,22 +4198,38 @@
             return exports.Api.ECacheKey.EntityCoords + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
         }
         EntityCoords.GetCacheKey = GetCacheKey;
-        function GetEntityCoords(api, entityId, reqParams) {
+        function GetEntityCoords(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, rootEntityId: entityId, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetCacheKey(entityId), reqParams);
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`entity/${entityId}/ucs`, reqParams);
-                api.Cache.Set(GetCacheKey(entityId), req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`entity/${entityId}/ucs`, reqParams);
+                        res({
+                            coords: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(GetCacheKey(entityId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         EntityCoords.GetEntityCoords = GetEntityCoords;
-        function EntityRelativeToPoint(api, entityId, params, reqParams) {
+        function EntityRelativeToPoint(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, rootEntityId: entityId, req: reqParams } = params;
                 if (!params.test) {
-                    yield UnlinkCoords(api, entityId);
+                    yield UnlinkCoords({
+                        api,
+                        rootEntityId: entityId,
+                        req: reqParams
+                    });
                 }
                 const point = params.point;
                 const name = params.name || `${exports.MathUtils.Round(point.latitude, 4)}, ${exports.MathUtils.Round(point.longitude, 4)}`;
@@ -3996,15 +4251,22 @@
                 if (!params.test) {
                     api.Cache.Remove(GetCacheKey(entityId));
                 }
-                return res;
+                return {
+                    coords: res
+                };
             });
         }
         EntityCoords.EntityRelativeToPoint = EntityRelativeToPoint;
-        function EntityRelativeToEpsg(api, entityId, params, reqParams) {
+        function EntityRelativeToEpsg(params) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, rootEntityId: entityId, req: reqParams } = params;
                 if (!params.test) {
-                    yield UnlinkCoords(api, entityId);
+                    yield UnlinkCoords({
+                        api,
+                        rootEntityId: entityId,
+                        req: reqParams
+                    });
                 }
                 const epsg = params.epsg;
                 const name = (_a = params.name) !== null && _a !== void 0 ? _a : "EPSG: " + epsg;
@@ -4024,14 +4286,21 @@
                 if (!params.test) {
                     api.Cache.Remove(GetCacheKey(entityId));
                 }
-                return res;
+                return {
+                    coords: res
+                };
             });
         }
         EntityCoords.EntityRelativeToEpsg = EntityRelativeToEpsg;
-        function EntityRelativeToUcs(api, entityId, params, reqParams) {
+        function EntityRelativeToUcs(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, rootEntityId: entityId, req: reqParams } = params;
                 if (!params.test) {
-                    yield UnlinkCoords(api, entityId);
+                    yield UnlinkCoords({
+                        api,
+                        rootEntityId: entityId,
+                        req: reqParams
+                    });
                 }
                 const ucsId = params.ucsId;
                 const res = yield api.POST(`entity/${entityId}/ucs`, {
@@ -4043,12 +4312,15 @@
                 if (!params.test) {
                     api.Cache.Remove(GetCacheKey(entityId));
                 }
-                return res;
+                return {
+                    coords: res
+                };
             });
         }
         EntityCoords.EntityRelativeToUcs = EntityRelativeToUcs;
-        function UnlinkCoords(api, entityId, reqParams) {
+        function UnlinkCoords(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, rootEntityId: entityId, req: reqParams } = params;
                 return api.DELETE(`entity/${entityId}/ucs`, reqParams);
             });
         }
@@ -4096,16 +4368,19 @@
             return `${exports.Api.ECacheKey.ClientFile}${exports.Api.ECacheKey.Id}${fileId}`;
         }
         ClientFile.GetCacheKey = GetCacheKey;
-        function GetUrl(api, fileId) {
+        function GetUrl(params) {
+            const { api, fileId } = params;
             return `${api.GetBaseUrl()}file/${fileId}`;
         }
         ClientFile.GetUrl = GetUrl;
-        function GetUrlWithExt(api, file) {
+        function GetUrlWithExt(params) {
+            const { api, file } = params;
             return `${api.GetBaseUrl()}file/${file.ID}${file.FileExt ? file.FileExt : ""}`;
         }
         ClientFile.GetUrlWithExt = GetUrlWithExt;
-        function Get(api, fileId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, fileId, req: reqParams } = params;
                 if (!fileId) {
                     throw ("File ID is required.");
                 }
@@ -4114,14 +4389,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`file/${fileId}/details`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(key, req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`file/${fileId}/details`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            clientFile: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         ClientFile.Get = Get;
-        function Delete(api, fileIds, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, fileIds, req: reqParams } = params;
                 if (!fileIds.length) {
                     throw ("File IDs are required.");
                 }
@@ -4136,8 +4422,9 @@
             });
         }
         ClientFile.Delete = Delete;
-        function Upload(api, file, purpose, reqParams) {
+        function Upload(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, file, purpose, req } = params;
                 if (!file) {
                     throw ("File is required.");
                 }
@@ -4147,30 +4434,42 @@
                         "Purpose": purpose
                     };
                 }
-                const params = exports.Api.PrepReqParams(reqParams);
-                params.formData = formData;
-                return api.UPLOAD("file/uploadNew", file, params);
+                const reqParams = exports.Api.PrepReqParams(req);
+                reqParams.formData = formData;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.UPLOAD("file/uploadNew", file, reqParams);
+                        res({
+                            clientFile: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                return prom;
             });
         }
         ClientFile.Upload = Upload;
         /**
          * Uploads a temp file.
          * This will return a temp file id which can be used in various endpoints.
-         * @param api
-         * @param file
-         * @param reqParams
+         * @param params
          * @returns
          */
-        function UploadTemp(api, file, reqParams) {
+        function UploadTemp(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, file, req } = params;
                 if (!file) {
                     throw ("File is required.");
                 }
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const params = exports.Api.PrepReqParams(reqParams);
-                        const data = yield api.UPLOAD("file/uploadTemp", file, params);
-                        res(data["TempFile.ID"]);
+                        const reqParams = exports.Api.PrepReqParams(req);
+                        const data = yield api.UPLOAD("file/uploadTemp", file, reqParams);
+                        res({
+                            tempFileId: data["TempFile.ID"]
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -4182,38 +4481,37 @@
         ClientFile.UploadTemp = UploadTemp;
         let Filter;
         (function (Filter) {
-            let V1;
-            (function (V1) {
-                let EColumn;
-                (function (EColumn) {
-                    EColumn["ID"] = "id";
-                    EColumn["Name"] = "name";
-                    EColumn["DateTime"] = "datetime";
-                    EColumn["MIMEType"] = "mimeType";
-                    EColumn["Size"] = "size";
-                    EColumn["User"] = "user";
-                    EColumn["Extension"] = "extension";
-                })(EColumn = V1.EColumn || (V1.EColumn = {}));
-                let ESortOrder;
-                (function (ESortOrder) {
-                    ESortOrder["ASC"] = "asc";
-                    ESortOrder["DEC"] = "desc";
-                })(ESortOrder = V1.ESortOrder || (V1.ESortOrder = {}));
-                let ERowOperator;
-                (function (ERowOperator) {
-                    ERowOperator["AND"] = "AND";
-                    ERowOperator["OR"] = "OR";
-                })(ERowOperator = V1.ERowOperator || (V1.ERowOperator = {}));
-                function GetList(api, filter, reqParams) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        const data = yield api.POST("files/filtered", filter, exports.Api.PrepReqParams(reqParams));
-                        return data.Items;
-                    });
-                }
-                V1.GetList = GetList;
-            })(V1 = Filter.V1 || (Filter.V1 = {}));
-            // TODO: Helpers for constructing the filter.
+            let EColumn;
+            (function (EColumn) {
+                EColumn["ID"] = "id";
+                EColumn["Name"] = "name";
+                EColumn["DateTime"] = "datetime";
+                EColumn["MIMEType"] = "mimeType";
+                EColumn["Size"] = "size";
+                EColumn["User"] = "user";
+                EColumn["Extension"] = "extension";
+            })(EColumn = Filter.EColumn || (Filter.EColumn = {}));
+            let ESortOrder;
+            (function (ESortOrder) {
+                ESortOrder["ASC"] = "asc";
+                ESortOrder["DEC"] = "desc";
+            })(ESortOrder = Filter.ESortOrder || (Filter.ESortOrder = {}));
+            let ERowOperator;
+            (function (ERowOperator) {
+                ERowOperator["AND"] = "AND";
+                ERowOperator["OR"] = "OR";
+            })(ERowOperator = Filter.ERowOperator || (Filter.ERowOperator = {}));
         })(Filter = ClientFile.Filter || (ClientFile.Filter = {}));
+        function GetList(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { api, filter, req: reqParams } = params;
+                const data = yield api.POST("files/filtered", filter, exports.Api.PrepReqParams(reqParams));
+                return {
+                    clientFiles: data.Items
+                };
+            });
+        }
+        ClientFile.GetList = GetList;
         let Processor;
         (function (Processor) {
             let EConvertExt;
@@ -4221,8 +4519,9 @@
                 EConvertExt["GLB"] = ".glb";
                 EConvertExt["SKP"] = ".skp";
             })(EConvertExt = Processor.EConvertExt || (Processor.EConvertExt = {}));
-            function ConvertFormat(api, clientFileId, ext, reqParams) {
+            function ConvertFormat(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    const { api, fileId: clientFileId, ext, req: reqParams } = params;
                     if (!clientFileId || !ext) {
                         throw ("Client File ID and extension are required.");
                     }
@@ -4252,8 +4551,9 @@
             EProgramId["BingMaps"] = "BingMaps";
             EProgramId["Mapbox"] = "Mapbox";
         })(EProgramId = ProgramKey.EProgramId || (ProgramKey.EProgramId = {}));
-        function Get(api, programId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, programId, req: reqParams } = params;
                 if (!programId) {
                     throw ("Program ID is required.");
                 }
@@ -4262,14 +4562,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`programkey/${programId}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(key, req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`programkey/${programId}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            programKey: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         ProgramKey.Get = Get;
-        function GetList(api, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cacheData) {
                     return cacheData;
@@ -4277,7 +4588,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET("programkeys", exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            programKeys: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -4288,8 +4601,9 @@
             });
         }
         ProgramKey.GetList = GetList;
-        function Delete(api, programId, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, programId, req: reqParams } = params;
                 if (!programId) {
                     throw ("Program ID is required.");
                 }
@@ -4299,15 +4613,18 @@
             });
         }
         ProgramKey.Delete = Delete;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, programKey: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data.ProgramId)) {
                     throw ("Program ID is required.");
                 }
-                data = yield api.POST("programkey", data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST("programkey", data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ProgramId));
                 api.Cache.Remove(GetListCacheKey());
-                return data;
+                return {
+                    programKey: res
+                };
             });
         }
         ProgramKey.Update = Update;
@@ -4354,8 +4671,9 @@
             EPivot["Weight"] = "weight";
             EPivot["UCS"] = "ucs";
         })(EPivot = Tileset.EPivot || (Tileset.EPivot = {}));
-        function Get(api, tilesetId, loadFiles = false, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tilesetId, loadFiles, req: reqParams } = params;
                 if (!tilesetId) {
                     throw ("Tileset ID is required.");
                 }
@@ -4363,14 +4681,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`tileset/get/${tilesetId}?noFiles=${loadFiles ? 0 : 1}`, reqParams);
-                api.Cache.Set(GetCacheKey(tilesetId, loadFiles), req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`tileset/get/${tilesetId}?noFiles=${Boolean(loadFiles) ? 0 : 1}`, reqParams);
+                        res({
+                            tileset: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(GetCacheKey(tilesetId, loadFiles), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         Tileset.Get = Get;
-        function GetList(api, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cacheData) {
                     return cacheData;
@@ -4378,7 +4707,9 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET("tileset/getList", reqParams);
-                        res(data);
+                        res({
+                            tilesets: data
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -4389,8 +4720,9 @@
             });
         }
         Tileset.GetList = GetList;
-        function Delete(api, tilesetId, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tilesetId, req: reqParams } = params;
                 if (!tilesetId) {
                     throw ("Tileset ID is required.");
                 }
@@ -4400,8 +4732,9 @@
             });
         }
         Tileset.Delete = Delete;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                let { api, tileset: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data.name) || !(data === null || data === void 0 ? void 0 : data.type)) {
                     throw ("Tileset name and type are required.");
                 }
@@ -4413,22 +4746,25 @@
                 yield api.POST(`tileset/update/${data.id}`, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset + exports.Api.ECacheKey.Id + data.id);
                 api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset);
-                return data;
+                return {
+                    tileset: data
+                };
             });
         }
         Tileset.Update = Update;
-        function UploadFile(api, tilesetId, file, reqParams) {
+        function UploadFile(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tilesetId, file, req: reqParams } = params;
                 if (!tilesetId || !file) {
                     throw ("Tileset ID and file are required.");
                 }
-                const params = exports.Api.PrepReqParams(reqParams);
-                return api.UPLOAD(`tileset/uploadFile/${tilesetId}/files`, file, params);
+                return api.UPLOAD(`tileset/uploadFile/${tilesetId}/files`, file, exports.Api.PrepReqParams(reqParams));
             });
         }
         Tileset.UploadFile = UploadFile;
-        function DeleteFile(api, tilesetId, file, reqParams) {
+        function DeleteFile(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tilesetId, file, req: reqParams } = params;
                 if (!tilesetId || !file) {
                     throw ("Tileset ID and file are required.");
                 }
@@ -4437,19 +4773,20 @@
             });
         }
         Tileset.DeleteFile = DeleteFile;
-        function UploadSrcFile(api, tilesetId, file, reqParams) {
+        function UploadSrcFile(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tilesetId, file, req: reqParams } = params;
                 if (!tilesetId || !file) {
                     throw ("Tileset ID and file are required.");
                 }
-                const params = exports.Api.PrepReqParams(reqParams);
-                yield api.UPLOAD(`tileset/uploadFile/${tilesetId}/src`, file, params);
+                yield api.UPLOAD(`tileset/uploadFile/${tilesetId}/src`, file, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(tilesetId, true));
             });
         }
         Tileset.UploadSrcFile = UploadSrcFile;
-        function DeleteSrcFile(api, tilesetId, file, reqParams) {
+        function DeleteSrcFile(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tilesetId, file, req: reqParams } = params;
                 if (!tilesetId || !file) {
                     throw ("Tileset ID and file are required.");
                 }
@@ -4458,7 +4795,8 @@
             });
         }
         Tileset.DeleteSrcFile = DeleteSrcFile;
-        function GetFileUrl(api, tilesetId, file) {
+        function GetFileUrl(params) {
+            let { api, tilesetId, file } = params;
             if (!tilesetId) {
                 throw ("Tileset ID is required.");
             }
@@ -4468,7 +4806,8 @@
             return api.GetBaseUrl() + `tileset/getFile/${tilesetId}/files/${file}`;
         }
         Tileset.GetFileUrl = GetFileUrl;
-        function GetSrcFileUrl(api, tilesetId, file) {
+        function GetSrcFileUrl(params) {
+            let { api, tilesetId, file } = params;
             if (!tilesetId) {
                 throw ("Tileset ID is required.");
             }
@@ -4478,7 +4817,8 @@
             return api.GetBaseUrl() + `tileset/getFile/${tilesetId}/src/${file}`;
         }
         Tileset.GetSrcFileUrl = GetSrcFileUrl;
-        function GetPublicFileUrl(api, tilesetId, file) {
+        function GetPublicFileUrl(params) {
+            let { api, tilesetId, file } = params;
             if (!tilesetId) {
                 throw ("Tileset ID is required.");
             }
@@ -4488,13 +4828,16 @@
             return api.GetBaseUrl() + `tileset/file/${tilesetId}/${file}`;
         }
         Tileset.GetPublicFileUrl = GetPublicFileUrl;
-        function Generate(api, tilesetId, reqParams) {
+        function Generate(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, tilesetId, req: reqParams } = params;
                 if (!tilesetId) {
                     throw ("Tileset ID is required.");
                 }
                 const res = yield api.GET(`tileset/generate/${tilesetId}`, exports.Api.PrepReqParams(reqParams));
-                return res.ID;
+                return {
+                    pendingActionId: res.ID
+                };
             });
         }
         Tileset.Generate = Generate;
@@ -4507,8 +4850,9 @@
                 return exports.Api.ECacheKey.PublishTileset + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey.Id + tilesetId;
             }
             Publish.GetCacheKey = GetCacheKey;
-            function Update(api, data, reqParams) {
+            function Update(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    const { api, published: data, req: reqParams } = params;
                     if (!(data === null || data === void 0 ? void 0 : data["Tileset.ID"]) || !(data === null || data === void 0 ? void 0 : data["PublishedBy.ClientAccount.ID"]) || !(data === null || data === void 0 ? void 0 : data["PublishedBy.User.ID"])) {
                         throw ("Tileset ID, client account ID, and user ID are required.");
                     }
@@ -4523,12 +4867,15 @@
                     yield api.POST(`tileset/${data.ID}/enableForAccounts`, req, reqParams);
                     api.Cache.Remove(GetCacheKey(data["PublishedBy.ClientAccount.ID"], data["Tileset.ID"]));
                     api.Cache.Remove(GetCacheKey(data["PublishedBy.ClientAccount.ID"]));
-                    return data;
+                    return {
+                        published: data
+                    };
                 });
             }
             Publish.Update = Update;
-            function Get(api, accountId, tilesetId, reqParams) {
+            function Get(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    const { api, accountId, tilesetId, req: reqParams } = params;
                     if (!accountId || !tilesetId) {
                         throw ("Client account ID and tileset ID are required.");
                     }
@@ -4536,14 +4883,25 @@
                     if (cacheData) {
                         return cacheData;
                     }
-                    const req = api.GET(`tilesetByPublisher/${accountId}/${tilesetId}`, reqParams);
-                    api.Cache.Set(GetCacheKey(accountId, tilesetId), req);
-                    return req;
+                    const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                        try {
+                            const data = yield api.GET(`tilesetByPublisher/${accountId}/${tilesetId}`, reqParams);
+                            res({
+                                published: data
+                            });
+                        }
+                        catch (e) {
+                            rej(e);
+                        }
+                    }));
+                    api.Cache.Set(GetCacheKey(accountId, tilesetId), prom);
+                    return prom;
                 });
             }
             Publish.Get = Get;
-            function GetList(api, accountId, reqParams) {
+            function GetList(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    const { api, accountId, req: reqParams } = params;
                     if (!accountId) {
                         throw ("Client account ID is required.");
                     }
@@ -4554,7 +4912,9 @@
                     const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                         try {
                             const data = yield api.GET(`tilesets/enabledForAccount/${accountId}`, reqParams);
-                            res(data.Items);
+                            res({
+                                published: data.Items
+                            });
                         }
                         catch (e) {
                             rej(e);
@@ -4566,6 +4926,23 @@
             }
             Publish.GetList = GetList;
         })(Publish = Tileset.Publish || (Tileset.Publish = {}));
+        let Settings;
+        (function (Settings) {
+            let EMapTileSize;
+            (function (EMapTileSize) {
+                EMapTileSize[EMapTileSize["IMG_256"] = 256] = "IMG_256";
+                EMapTileSize[EMapTileSize["IMG_512"] = 512] = "IMG_512";
+                EMapTileSize[EMapTileSize["IMG_1024"] = 1024] = "IMG_1024";
+                EMapTileSize[EMapTileSize["IMG_2048"] = 2048] = "IMG_2048";
+            })(EMapTileSize = Settings.EMapTileSize || (Settings.EMapTileSize = {}));
+            let EExternalMapType;
+            (function (EExternalMapType) {
+                EExternalMapType["TileMapImagery"] = "TileMapImagery";
+                EExternalMapType["OpenStreetMapImagery"] = "OpenStreetMapImagery";
+                EExternalMapType["MapBoxImagery"] = "MapBoxImagery";
+                EExternalMapType["CesiumIon"] = "CesiumIon";
+            })(EExternalMapType = Settings.EExternalMapType || (Settings.EExternalMapType = {}));
+        })(Settings = Tileset.Settings || (Tileset.Settings = {}));
     })(exports.Tileset || (exports.Tileset = {}));
 
     (function (MenuItem) {
@@ -4684,16 +5061,17 @@
         // This is the expected default version for the DataVersion value.
         // This value should NOT be changed without looking at our API and seeing what the default value is.
         ProjectViewBookmark.DEFAULT_DATA_VERSION = 1;
-        let V1;
-        (function (V1) {
-            V1.DATA_VERSION = 1;
-        })(V1 = ProjectViewBookmark.V1 || (ProjectViewBookmark.V1 = {}));
-        let V2;
-        (function (V2) {
-            V2.DATA_VERSION = 2;
-        })(V2 = ProjectViewBookmark.V2 || (ProjectViewBookmark.V2 = {}));
-        function Get(api, viewId, bookmarkId, reqParams) {
+        let LegacyNavigator;
+        (function (LegacyNavigator) {
+            LegacyNavigator.DATA_VERSION = 1;
+        })(LegacyNavigator = ProjectViewBookmark.LegacyNavigator || (ProjectViewBookmark.LegacyNavigator = {}));
+        let Navigator;
+        (function (Navigator) {
+            Navigator.DATA_VERSION = 2;
+        })(Navigator = ProjectViewBookmark.Navigator || (ProjectViewBookmark.Navigator = {}));
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, viewId, bookmarkId, req: reqParams } = params;
                 if (!viewId || !bookmarkId) {
                     throw ("View ID and Bookmark ID are required.");
                 }
@@ -4702,14 +5080,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`ui.view/${viewId}/slide/${bookmarkId}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(key, req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`ui.view/${viewId}/slide/${bookmarkId}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            bookmark: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         ProjectViewBookmark.Get = Get;
-        function Delete(api, viewId, bookmarkId, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, viewId, bookmarkId, req: reqParams } = params;
                 if (!viewId || !bookmarkId) {
                     throw ("View ID and Bookmark ID are required.");
                 }
@@ -4719,8 +5108,9 @@
             });
         }
         ProjectViewBookmark.Delete = Delete;
-        function GetList(api, viewId, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, viewId, req: reqParams } = params;
                 if (!viewId) {
                     throw ("View ID is required.");
                 }
@@ -4738,11 +5128,15 @@
                         for (let i = 0; i < items.length; i++) {
                             const item = items[i];
                             const prom = new Promise((res) => {
-                                res(item);
+                                res({
+                                    bookmark: item
+                                });
                             });
                             api.Cache.Set(GetCacheKey(viewId, item.ID), prom, exports.Api.DEFAULT_CACHE_DURATION);
                         }
-                        res(items);
+                        res({
+                            bookmarks: items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -4753,20 +5147,24 @@
             });
         }
         ProjectViewBookmark.GetList = GetList;
-        function Update(api, viewId, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, viewId, bookmark: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data.Title)) {
                     data.Title = data.ID;
                 }
-                data = yield api.POST(`ui.view/${viewId}/slide/${data.ID ? data.ID : ""}`, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(`ui.view/${viewId}/slide/${data.ID ? data.ID : ""}`, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(viewId, data.ID));
                 api.Cache.Remove(GetListCacheKey(viewId));
-                return data;
+                return {
+                    bookmark: res
+                };
             });
         }
         ProjectViewBookmark.Update = Update;
-        function SetOrder(api, viewId, bookmarkIds, reqParams) {
+        function SetOrder(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, viewId, bookmarkIds, req: reqParams } = params;
                 const reqData = {
                     "UISlide.ID": bookmarkIds,
                     "DisplayOrder.Start": 0
@@ -4790,16 +5188,17 @@
         // This is the expected default version for the DataVersion value.
         // This value should NOT be changed without looking at our API and seeing what the default value is.
         ProjectView.DEFAULT_DATA_VERSION = 1;
-        let V1;
-        (function (V1) {
-            V1.DATA_VERSION = 1;
-        })(V1 = ProjectView.V1 || (ProjectView.V1 = {}));
-        let V2;
-        (function (V2) {
-            V2.DATA_VERSION = 2;
-        })(V2 = ProjectView.V2 || (ProjectView.V2 = {}));
-        function Get(api, viewId, reqParams) {
+        let LegacyNavigator;
+        (function (LegacyNavigator) {
+            LegacyNavigator.DATA_VERSION = 1;
+        })(LegacyNavigator = ProjectView.LegacyNavigator || (ProjectView.LegacyNavigator = {}));
+        let Navigator;
+        (function (Navigator) {
+            Navigator.DATA_VERSION = 2;
+        })(Navigator = ProjectView.Navigator || (ProjectView.Navigator = {}));
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, viewId, req: reqParams } = params;
                 if (!viewId) {
                     throw ("View ID is required.");
                 }
@@ -4808,34 +5207,48 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`ui.view/${viewId}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(key, req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`ui.view/${viewId}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            view: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         ProjectView.Get = Get;
-        function GetList(api, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET("ui.view/list", exports.Api.PrepReqParams(reqParams));
-                        res(data.Items);
+                        res({
+                            views: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                api.Cache.Set(GetListCacheKey(), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         ProjectView.GetList = GetList;
-        function Delete(api, viewId, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, viewId, req: reqParams } = params;
                 if (!viewId) {
                     throw ("View ID is required.");
                 }
@@ -4845,8 +5258,9 @@
             });
         }
         ProjectView.Delete = Delete;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                let { api, view: data, req: reqParams } = params;
                 if (!data) {
                     data = {};
                 }
@@ -4868,7 +5282,9 @@
                 }
                 api.Cache.Remove(GetCacheKey(data.ID));
                 api.Cache.Remove(GetListCacheKey());
-                return data;
+                return {
+                    view: data
+                };
             });
         }
         ProjectView.Update = Update;
@@ -4877,7 +5293,11 @@
     function getTemplateSettings(apiGetter, reqParams) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const view = yield exports.ProjectView.Get(apiGetter.getApi(exports.Api.TEMPLATE_ACCOUNT_ID), "default", reqParams);
+            const { view } = yield exports.ProjectView.Get({
+                api: apiGetter.getApi(exports.Api.TEMPLATE_ACCOUNT_ID),
+                viewId: "default",
+                req: reqParams
+            });
             return (_a = view.Settings) !== null && _a !== void 0 ? _a : {};
         });
     }
@@ -4894,29 +5314,35 @@
         }
     }
     (function (ProjectViewLegacyTile) {
-        function MergeMapTemplateData(getter, items, addIfMissing, reqParams) {
+        function MergeMapTemplateData(params) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
+                const { getter, sources: items, addIfMissing, req: reqParams } = params;
                 const settings = yield getTemplateSettings(getter, reqParams);
                 const maps = (_a = settings.CesiumMapSources) !== null && _a !== void 0 ? _a : [];
                 for (let i = 0; i < maps.length; i++) {
                     const mapSource = maps[i];
                     checkSourceToTemplate(items, mapSource, addIfMissing);
                 }
-                return [];
+                return {
+                    sources: items
+                };
             });
         }
         ProjectViewLegacyTile.MergeMapTemplateData = MergeMapTemplateData;
-        function MergeTerrainTemplateData(getter, items, addIfMissing, reqParams) {
+        function MergeTerrainTemplateData(params) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
+                const { getter, sources: items, addIfMissing, req: reqParams } = params;
                 const settings = yield getTemplateSettings(getter, reqParams);
                 const terrains = (_a = settings.CesiumTerrainSources) !== null && _a !== void 0 ? _a : [];
                 for (let i = 0; i < terrains.length; i++) {
                     const terrainSource = terrains[i];
                     checkSourceToTemplate(items, terrainSource, addIfMissing);
                 }
-                return [];
+                return {
+                    sources: items
+                };
             });
         }
         ProjectViewLegacyTile.MergeTerrainTemplateData = MergeTerrainTemplateData;
@@ -5046,24 +5472,32 @@
             EStatus["Complete"] = "COMPLETE";
             EStatus["Failed"] = "FAILED";
         })(EStatus = PendingAction.EStatus || (PendingAction.EStatus = {}));
-        function Get(api, actionId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, actionId, req: reqParams } = params;
                 if (!actionId) {
                     throw ("Action ID is required.");
                 }
-                return api.GET(`pendingAction/${actionId}`, exports.Api.PrepReqParams(reqParams));
+                const data = yield api.GET(`pendingAction/${actionId}`, exports.Api.PrepReqParams(reqParams));
+                return {
+                    action: data
+                };
             });
         }
         PendingAction.Get = Get;
-        function GetRelevantList(api, stricter = false, reqParams) {
+        function GetRelevantList(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                const data = yield api.GET(`pendingActions/important?Update=${stricter}`, exports.Api.PrepReqParams(reqParams));
-                return data.Items;
+                const { api, stricter, reqParams } = params;
+                const data = yield api.GET(`pendingActions/important?Update=${Boolean(stricter)}`, exports.Api.PrepReqParams(reqParams));
+                return {
+                    actions: data.Items
+                };
             });
         }
         PendingAction.GetRelevantList = GetRelevantList;
-        function GetMessages(api, actionId, order, startIndex, amount, reqParams) {
+        function GetMessages(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                let { api, actionId, order, startIndex, amount, req: reqParams } = params;
                 if (amount == null) {
                     amount = 500;
                 }
@@ -5075,7 +5509,9 @@
                 }
                 const args = `?SortOrder=${order == exports.Api.ESortOrder.Desc ? "DESC" : "ASC"}&PageSize=${amount}&PageIndex=${startIndex}`;
                 const data = yield api.GET(`pendingAction/${actionId}/progressMessages` + args, exports.Api.PrepReqParams(reqParams));
-                return data.Items;
+                return {
+                    messages: data.Items
+                };
             });
         }
         PendingAction.GetMessages = GetMessages;
@@ -5101,25 +5537,29 @@
             EPointType["Icon"] = "ICON";
             EPointType["Cylinder"] = "CYLINDER";
         })(EPointType = Style.EPointType || (Style.EPointType = {}));
-        function GetList(api, reqParams) {
+        function GetList(params) {
+            const { api, req: reqParams } = params;
             const cacheData = api.GetCacheItem(GetListCacheKey(), reqParams);
             if (cacheData) {
                 return cacheData;
             }
-            const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+            const res = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET("ui.entityDisplaySettings", exports.Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        styles: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), req, exports.Api.DEFAULT_CACHE_DURATION);
-            return req;
+            api.Cache.Set(GetListCacheKey(), res, exports.Api.DEFAULT_CACHE_DURATION);
+            return res;
         }
         Style.GetList = GetList;
-        function Get(api, id, reqParams) {
+        function Get(params) {
+            const { api, styleId: id, req: reqParams } = params;
             if (!id) {
                 throw ("Style ID is required.");
             }
@@ -5127,28 +5567,42 @@
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`ui.entityDisplaySetting/${id}`, exports.Api.PrepReqParams(reqParams));
-            api.Cache.Set(GetCacheKey(id), req, exports.Api.DEFAULT_CACHE_DURATION);
-            return req;
+            const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const data = yield api.GET(`ui.entityDisplaySetting/${id}`, exports.Api.PrepReqParams(reqParams));
+                    res({
+                        style: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(GetCacheKey(id), prom, exports.Api.DEFAULT_CACHE_DURATION);
+            return prom;
         }
         Style.Get = Get;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, style: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data.Name)) {
                     throw ("Style name is required.");
                 }
                 if (!data.ID) {
                     data.ID = 0;
                 }
-                data = yield api.POST(`ui.entityDisplaySetting/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
+                const res = yield api.POST(`ui.entityDisplaySetting/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
                 api.Cache.Remove(GetListCacheKey());
-                return data;
+                return {
+                    style: res
+                };
             });
         }
         Style.Update = Update;
-        function Delete(api, id, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, styleId: id, req: reqParams } = params;
                 if (!id) {
                     throw ("Style ID is required.");
                 }
@@ -5160,35 +5614,6 @@
         Style.Delete = Delete;
     })(exports.Style || (exports.Style = {}));
 
-    /**
-     * Describes expected settings for an entities-map tileset.
-     * This is the kind of tileset generated from arbitrary Bruce entities-
-     * which produced map tiles of the entity vector geometry.
-     */
-    (function (TilesetEntitiesMapTiles) {
-        let ETileSize;
-        (function (ETileSize) {
-            ETileSize[ETileSize["IMG_256"] = 256] = "IMG_256";
-            ETileSize[ETileSize["IMG_512"] = 512] = "IMG_512";
-            ETileSize[ETileSize["IMG_1024"] = 1024] = "IMG_1024";
-            ETileSize[ETileSize["IMG_2048"] = 2048] = "IMG_2048";
-        })(ETileSize = TilesetEntitiesMapTiles.ETileSize || (TilesetEntitiesMapTiles.ETileSize = {}));
-    })(exports.TilesetEntitiesMapTiles || (exports.TilesetEntitiesMapTiles = {}));
-
-    /**
-     * Describes settings for an external map-tiles tileset.
-     * This will serve content from elsewhere with the assumption that the data is valid map tiles.
-     */
-    (function (TilesetExtMapTiles) {
-        let EType;
-        (function (EType) {
-            EType["TileMapImagery"] = "TileMapImagery";
-            EType["OpenStreetMapImagery"] = "OpenStreetMapImagery";
-            EType["MapBoxImagery"] = "MapBoxImagery";
-            EType["CesiumIon"] = "CesiumIon";
-        })(EType = TilesetExtMapTiles.EType || (TilesetExtMapTiles.EType = {}));
-    })(exports.TilesetExtMapTiles || (exports.TilesetExtMapTiles = {}));
-
     (function (Permission) {
         let EPerm;
         (function (EPerm) {
@@ -5210,8 +5635,9 @@
         function GetCacheKey(sessionId) {
             return `${exports.Api.ECacheKey.Session}${exports.Api.ECacheKey.Id}${sessionId}`;
         }
-        function Get(api, sessionId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, sessionId, req: reqParams } = params;
                 if (!sessionId) {
                     throw ("Session ID is required.");
                 }
@@ -5220,14 +5646,25 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`session/${sessionId}`, reqParams);
-                api.Cache.Set(key, req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`session/${sessionId}`, reqParams);
+                        res({
+                            session: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         Session.Get = Get;
-        function Login(api, username, password, accountId, reqParams) {
+        function Login(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, username, password, accountId, req: reqParams } = params;
                 if (!username || !password) {
                     throw ("Username and password are required.");
                 }
@@ -5240,12 +5677,15 @@
                 const ssid = session === null || session === void 0 ? void 0 : session.ID;
                 api.SetSessionId(ssid);
                 api.Cache.Remove(GetCacheKey(ssid));
-                return session;
+                return {
+                    session: session
+                };
             });
         }
         Session.Login = Login;
-        function Logout(api, reqParams) {
+        function Logout(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, req: reqParams } = params;
                 const ssid = api.GetSessionId();
                 if (ssid) {
                     yield api.POST("logout", null, reqParams);
@@ -5255,8 +5695,9 @@
             });
         }
         Session.Logout = Logout;
-        function IsPermEnabled(session, accountId, perm) {
+        function IsPermEnabled(params) {
             var _a, _b;
+            let { session, accountId, perm } = params;
             if (!perm) {
                 throw ("Perm is required.");
             }
@@ -5280,8 +5721,9 @@
             return false;
         }
         Session.IsPermEnabled = IsPermEnabled;
-        function IsSuperPermEnabled(session, perm) {
+        function IsSuperPermEnabled(params) {
             var _a, _b;
+            let { session, perm } = params;
             if (!perm) {
                 throw ("Perm is required.");
             }
@@ -5290,58 +5732,79 @@
             return accessPerms.findIndex(x => x.toLocaleUpperCase() == perm) > -1;
         }
         Session.IsSuperPermEnabled = IsSuperPermEnabled;
-        function IsAccountAdmin(session, accountId) {
-            return IsPermEnabled(session, accountId, exports.Permission.EPerm.ADMIN);
+        function IsAccountAdmin(params) {
+            return IsPermEnabled({
+                perm: exports.Permission.EPerm.ADMIN,
+                accountId: params.accountId,
+                session: params.session
+            });
         }
         Session.IsAccountAdmin = IsAccountAdmin;
-        function IsSuperAdmin(session) {
-            return IsSuperPermEnabled(session, exports.Permission.EPerm.ADMIN);
+        function IsSuperAdmin(params) {
+            return IsSuperPermEnabled({
+                session: params.session,
+                perm: exports.Permission.EPerm.ADMIN
+            });
         }
         Session.IsSuperAdmin = IsSuperAdmin;
     })(exports.Session || (exports.Session = {}));
 
     (function (UserGroup) {
-        function GetByName(api, accountId, name, reqParams) {
+        function GetByName(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, accountId, name, req: reqParams } = params;
                 if (!name || !accountId) {
                     throw ("Name and AccountID are required.");
                 }
-                return api.GET(`account/${accountId}/userGroupByName/${name}`, reqParams);
+                const data = yield api.GET(`account/${accountId}/userGroupByName/${name}`, reqParams);
+                return {
+                    group: data
+                };
             });
         }
         UserGroup.GetByName = GetByName;
-        function GetUsers(api, accountId, id, reqParams) {
+        function GetUsers(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, accountId, groupId: id, req: reqParams } = params;
                 if (!accountId || !id) {
                     throw ("AccountID and ID are required.");
                 }
                 const data = yield api.GET(`userGroup/${accountId}/${id}/users`, reqParams);
-                return data.Items;
+                return {
+                    users: data.Items
+                };
             });
         }
         UserGroup.GetUsers = GetUsers;
-        function GetListByPerm(api, accountId, perm, reqParams) {
+        function GetListByPerm(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, accountId, perm, req: reqParams } = params;
                 if (!accountId || !perm) {
                     throw ("AccountID and Perm are required.");
                 }
                 const data = yield api.GET(`userGroupsByFeature/${accountId}/${perm}`, reqParams);
-                return data.Items;
+                return {
+                    groups: data.Items
+                };
             });
         }
         UserGroup.GetListByPerm = GetListByPerm;
-        function GetList(api, accountId, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, accountId, req: reqParams } = params;
                 if (!accountId) {
                     throw ("AccountID is required.");
                 }
                 const data = yield api.GET(`userGroups/${accountId}`, reqParams);
-                return data.Items;
+                return {
+                    groups: data.Items
+                };
             });
         }
         UserGroup.GetList = GetList;
-        function Delete(api, accountId, id, reqParams) {
+        function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, accountId, groupId: id, req: reqParams } = params;
                 if (!accountId || !id) {
                     throw ("AccountID and ID are required.");
                 }
@@ -5349,13 +5812,16 @@
             });
         }
         UserGroup.Delete = Delete;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, group: data, reqParams } = params;
                 if (!data.Name || !data["ClientAccount.ID"]) {
                     throw ("User group name and client account ID are required.");
                 }
-                data = yield api.POST(`userGroup${data.ID ? ("/" + data.ID) : ""}`, data, reqParams);
-                return data;
+                const res = yield api.POST(`userGroup${data.ID ? ("/" + data.ID) : ""}`, data, reqParams);
+                return {
+                    group: res
+                };
             });
         }
         UserGroup.Update = Update;
@@ -5385,8 +5851,9 @@
             EType["User"] = "LOGIN_USER";
             EType["AccessToken"] = "ACCESS_TOKEN";
         })(EType = User.EType || (User.EType = {}));
-        function Get(api, id, accountId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, userId: id, accountId, req: reqParams } = params;
                 if (!id) {
                     throw ("ID is required.");
                 }
@@ -5396,13 +5863,16 @@
                 }
                 const req = yield api.GET(`user/${id}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
                 api.Cache.Set(GetCacheKey(id, accountId), req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                return {
+                    user: req
+                };
             });
         }
         User.Get = Get;
-        function Update(api, data, reqParams) {
+        function Update(params) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, user: data, req: reqParams } = params;
                 if (!(data === null || data === void 0 ? void 0 : data.ID) || !(data === null || data === void 0 ? void 0 : data.Type)) {
                     throw ("ID and Type are required.");
                 }
@@ -5419,7 +5889,7 @@
                         }
                     }
                 }
-                data = yield api.POST(`user/${data.ID}`, data, reqParams);
+                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) {
                     api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
@@ -5427,7 +5897,9 @@
                 else if (data.Type == EType.User) {
                     api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account);
                 }
-                return data;
+                return {
+                    user: res
+                };
             });
         }
         User.Update = Update;
@@ -5450,14 +5922,18 @@
                     try {
                         const data = yield api.GET(`user/${userId}/application/${appId}/settings`);
                         const settings = (data === null || data === void 0 ? void 0 : data.Settings) ? data.Settings : {};
-                        res(settings);
+                        res({
+                            settings: settings
+                        });
                     }
                     catch (e) {
                         // It will complain if an app id hasn't been used yet.
                         // We need to suppress that error.
                         if (e && typeof e == "object") {
                             if (e.ERROR && typeof e.ERROR == "object" && e.ERROR.Type == "NotFound") {
-                                res({});
+                                res({
+                                    settings: {}
+                                });
                                 return;
                             }
                         }
@@ -5492,8 +5968,9 @@
             });
         }
         User.UpdateSettings = UpdateSettings;
-        function GetUsernameAvailable(api, username, excludeUserId, reqParams) {
+        function GetUsernameAvailable(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, username, excludeUserId, req: reqParams } = params;
                 if (!username) {
                     throw ("Username is required.");
                 }
@@ -5501,7 +5978,9 @@
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield req;
-                        res(data.IsAvailable);
+                        res({
+                            isAvailable: data.IsAvailable
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -5517,8 +5996,9 @@
                 return exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId;
             }
             LoginUser.GetListCacheKey = GetListCacheKey;
-            function GetByEmail(api, email, accountId, reqParams) {
+            function GetByEmail(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    const { api, email, accountId, req: reqParams } = params;
                     if (!email) {
                         throw ("Email is required.");
                     }
@@ -5528,12 +6008,15 @@
                     }
                     const req = yield api.GET(`userByEmail/${email}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
                     api.Cache.Set(GetEmailCacheKey(email, accountId), req, exports.Api.DEFAULT_CACHE_DURATION);
-                    return req;
+                    return {
+                        user: req
+                    };
                 });
             }
             LoginUser.GetByEmail = GetByEmail;
-            function GetList(api, accountId, exclusive, reqParams) {
+            function GetList(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    let { api, accountId, exclusive, req: reqParams } = params;
                     if (!accountId) {
                         throw ("Client account ID is required.");
                     }
@@ -5547,13 +6030,16 @@
                     const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                         try {
                             const data = yield api.GET(`users?clientAccountID=${accountId}${exclusive ? "&allExcludingClientAccount=true" : ""}`, reqParams);
-                            res(data.Items);
+                            res({
+                                users: data.Items
+                            });
                         }
                         catch (e) {
                             rej(e);
                         }
                     }));
-                    req.then((users) => {
+                    req.then((data) => {
+                        const users = data.users;
                         for (let i = 0; i < users.length; i++) {
                             api.Cache.Set(GetCacheKey(users[i].ID, accountId), users[i]);
                         }
@@ -5567,12 +6053,12 @@
             LoginUser.GetList = GetList;
             /**
              * Sends a signup email to the specified email address.
-             * @param api
-             * @param email
+             * @param params
              * @returns
              */
-            function Signup(api, email, reqParams) {
+            function Signup(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    const { api, email, req: reqParams } = params;
                     if (!email) {
                         throw ("Email is required.");
                     }
@@ -5584,12 +6070,12 @@
             LoginUser.Signup = Signup;
             /**
              * Sends a new signup email using a previous one's expired code.
-             * @param api
-             * @param expiredCode
+             * @param params
              * @returns
              */
-            function SignupResend(api, expiredCode, reqParams) {
+            function SignupResend(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    const { api, expiredCode, req: reqParams } = params;
                     if (!expiredCode) {
                         throw ("Expired activation code is required.");
                     }
@@ -5599,14 +6085,12 @@
             LoginUser.SignupResend = SignupResend;
             /**
              * Completes signup using user data and a signup code.
-             * @param api
-             * @param code
-             * @param data
-             * @param accountId
+             * @param params
              * @returns
              */
-            function SignupComplete(api, code, data, accountId, reqParams) {
+            function SignupComplete(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    let { api, code, user: data, accountId, req: reqParams } = params;
                     if (!code || !(data === null || data === void 0 ? void 0 : data.Login) || !(data === null || data === void 0 ? void 0 : data.Password)) {
                         throw ("Login, password, and activation code are required.");
                     }
@@ -5619,19 +6103,20 @@
                     if (data.Email) {
                         api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserEmail + data.Email);
                     }
-                    return res;
+                    return {
+                        user: res
+                    };
                 });
             }
             LoginUser.SignupComplete = SignupComplete;
             /**
              * Sends a password reset email to the specified email address.
-             * @param api
-             * @param accountId
-             * @param email
+             * @param params
              * @returns user id associated with provided email.
              */
-            function ForgotPassword(api, accountId, email, reqParams) {
+            function ForgotPassword(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    const { api, accountId, email, req: reqParams } = params;
                     if (!accountId || !email) {
                         throw ("Account ID and email are required.");
                     }
@@ -5641,7 +6126,9 @@
                     const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                         try {
                             const data = yield req;
-                            res(data.ID);
+                            res({
+                                userId: data.ID
+                            });
                         }
                         catch (e) {
                             rej(e);
@@ -5653,22 +6140,28 @@
             LoginUser.ForgotPassword = ForgotPassword;
             /**
              * Completes password reset using a password reset code and new password.
-             * @param api
-             * @param code
-             * @param userId
-             * @param password
+             * @param params
              * @returns
              */
-            function ForgotPasswordComplete(api, code, userId, password, reqParams) {
+            function ForgotPasswordComplete(params) {
                 return __awaiter(this, void 0, void 0, function* () {
-                    const user = yield Get(api, userId, "");
-                    return api.POST("UserSetNameAndPassword", {
+                    const { api, code, userId, password, req: reqParams } = params;
+                    const { user } = yield Get({
+                        api: api,
+                        userId: userId,
+                        accountId: "",
+                        req: reqParams
+                    });
+                    const res = yield api.POST("UserSetNameAndPassword", {
                         ID: userId,
                         Email: user.Email,
                         ActivationCode: code,
                         Password: password,
                         FullName: user.FullName
                     }, reqParams);
+                    return {
+                        user: res
+                    };
                 });
             }
             LoginUser.ForgotPasswordComplete = ForgotPasswordComplete;
@@ -5679,8 +6172,9 @@
                 return exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId;
             }
             AccessToken.GetListCacheKey = GetListCacheKey;
-            function GetList(api, accountId, reqParams) {
+            function GetList(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    const { api, accountId, req: reqParams } = params;
                     const cacheData = api.GetCacheItem(GetListCacheKey(accountId), reqParams);
                     if (cacheData) {
                         return cacheData;
@@ -5688,13 +6182,16 @@
                     const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                         try {
                             const data = yield api.GET("usersByClientAccount/accessTokens", reqParams);
-                            res(data.Items);
+                            res({
+                                tokens: data.Items
+                            });
                         }
                         catch (e) {
                             rej(e);
                         }
                     }));
-                    req.then((users) => {
+                    req.then((data) => {
+                        const users = data.tokens;
                         for (let i = 0; i < users.length; i++) {
                             api.Cache.Set(GetCacheKey(users[i].ID, accountId), users[i]);
                         }
@@ -5704,16 +6201,18 @@
                 });
             }
             AccessToken.GetList = GetList;
-            function Delete(api, id, reqParams) {
+            function Delete(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    const { api, tokenId: id, req: reqParams } = params;
                     yield api.DELETE(`accessToken/${id}`, reqParams);
                     api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + id);
                     api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                 });
             }
             AccessToken.Delete = Delete;
-            function Create(api, data, reqParams) {
+            function Create(params) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    let { api, token: data, req: reqParams } = params;
                     if (!data) {
                         data = {};
                     }
@@ -5725,7 +6224,9 @@
                     }
                     data = yield api.POST("accessToken", data, reqParams);
                     api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
-                    return data;
+                    return {
+                        token: data
+                    };
                 });
             }
             AccessToken.Create = Create;
@@ -5816,13 +6317,13 @@
             Clear() {
                 this.refresh({});
             }
-            refresh(data) {
+            refresh(urlParams) {
                 const params = [];
-                const keys = Object.keys(data);
+                const keys = Object.keys(urlParams);
                 for (let i = 0; i < keys.length; i++) {
                     const key = keys[i];
                     if (this._allowedKeys == null || this._allowedKeys.includes(key)) {
-                        const val = data[key];
+                        const val = urlParams[key];
                         if (!!val || val == 0) {
                             params.push(`${key}=${val}`);
                         }
@@ -5845,46 +6346,48 @@
             EReqKey["Primary"] = "PrimarySelection";
             EReqKey["Secondary"] = "SecondarySelection";
         })(EReqKey = DataLab.EReqKey || (DataLab.EReqKey = {}));
-        let Entity;
-        (function (Entity) {
-            function GetList(api, query, key, skip, load, reqParams) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    if (!key) {
-                        key = EReqKey.Primary;
-                    }
-                    if (!skip) {
-                        skip = 0;
+        function Run(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                let { api, query, key, skip, load, req: reqParams } = params;
+                if (!key) {
+                    key = EReqKey.Primary;
+                }
+                if (!skip) {
+                    skip = 0;
+                }
+                if (!load) {
+                    load = 50;
+                }
+                const req = api.POST(`entities/datalab/getMatchingEntities/${key}?skip=${skip}&load=${load}`, query, exports.Api.PrepReqParams(reqParams));
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield req;
+                        res({
+                            entities: data.Items
+                        });
                     }
-                    if (!load) {
-                        load = 50;
+                    catch (e) {
+                        rej(e);
                     }
-                    const req = api.POST(`entities/datalab/getMatchingEntities/${key}?skip=${skip}&load=${load}`, query, exports.Api.PrepReqParams(reqParams));
-                    const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
-                        try {
-                            const data = yield req;
-                            res(data.Items);
-                        }
-                        catch (e) {
-                            rej(e);
-                        }
-                    }));
-                    return prom;
-                });
-            }
-            Entity.GetList = GetList;
-        })(Entity = DataLab.Entity || (DataLab.Entity = {}));
+                }));
+                return prom;
+            });
+        }
+        DataLab.Run = Run;
     })(exports.DataLab || (exports.DataLab = {}));
 
     (function (ImportCad) {
-        function Analyze(api, params, reqParams) {
+        function Analyze(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                return api.POST("entities/PrepareIFCForImport", params, exports.Api.PrepReqParams(reqParams));
+                const { api, fileAnalyze, req: reqParams } = params;
+                return api.POST("entities/PrepareIFCForImport", fileAnalyze, exports.Api.PrepReqParams(reqParams));
             });
         }
         ImportCad.Analyze = Analyze;
-        function ImportEntities(api, params, reqParams) {
+        function ImportEntities(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                return api.POST("entities/importIFCWithProgress", params, exports.Api.PrepReqParams(reqParams));
+                const { api, fileImport, req: reqParams } = params;
+                return api.POST("entities/importIFCWithProgress", fileImport, exports.Api.PrepReqParams(reqParams));
             });
         }
         ImportCad.ImportEntities = ImportEntities;
@@ -5910,27 +6413,30 @@
     })(exports.ImportCad || (exports.ImportCad = {}));
 
     (function (ImportCsv) {
-        function ImportEntities(api, params, reqParams) {
+        function ImportEntities(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                return api.POST("entities/importCSVWithProgress2", params, exports.Api.PrepReqParams(reqParams));
+                const { api, fileImport, req: reqParams } = params;
+                return api.POST("entities/importCSVWithProgress2", fileImport, exports.Api.PrepReqParams(reqParams));
             });
         }
         ImportCsv.ImportEntities = ImportEntities;
     })(exports.ImportCsv || (exports.ImportCsv = {}));
 
     (function (ImportJson) {
-        function ImportEntities(api, params, reqParams) {
+        function ImportEntities(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                return api.POST("entities/importJsonWithProgress", params, exports.Api.PrepReqParams(reqParams));
+                const { api, fileImport, req: reqParams } = params;
+                return api.POST("entities/importJsonWithProgress", fileImport, exports.Api.PrepReqParams(reqParams));
             });
         }
         ImportJson.ImportEntities = ImportEntities;
     })(exports.ImportJson || (exports.ImportJson = {}));
 
     (function (ImportKml) {
-        function ImportEntities(api, params, reqParams) {
+        function ImportEntities(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                return api.POST("entities/importKMLWithProgress2", params, exports.Api.PrepReqParams(reqParams));
+                const { api, fileImport, req: reqParams } = params;
+                return api.POST("entities/importKMLWithProgress2", fileImport, exports.Api.PrepReqParams(reqParams));
             });
         }
         ImportKml.ImportEntities = ImportEntities;
@@ -5950,8 +6456,9 @@
             EFileType["CAD"] = "CAD";
             EFileType["All"] = "All";
         })(EFileType = ImportedFile.EFileType || (ImportedFile.EFileType = {}));
-        function GetList(api, type, pageIndex, reqParams) {
+        function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                let { api, fileType: type, pageIndex, req: reqParams } = params;
                 if (!type) {
                     type = EFileType.All;
                 }
@@ -5975,7 +6482,9 @@
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield req;
-                        res(data.Items);
+                        res({
+                            importedFiles: data.Items
+                        });
                     }
                     catch (e) {
                         rej(e);
@@ -5986,15 +6495,26 @@
             });
         }
         ImportedFile.GetList = GetList;
-        function Get(api, fileId, reqParams) {
+        function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, importedFileId: fileId, req: reqParams } = params;
                 const cacheData = api.GetCacheItem(GetCacheKey(fileId), reqParams);
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = api.GET(`entityImportFile/${fileId}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Set(GetCacheKey(fileId), req, exports.Api.DEFAULT_CACHE_DURATION);
-                return req;
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`entityImportFile/${fileId}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            importedFile: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(GetCacheKey(fileId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         ImportedFile.Get = Get;
@@ -6077,104 +6597,105 @@
                 type: EType.Default
             };
         })(Div = Markup.Div || (Markup.Div = {}));
-        let Drawing;
-        (function (Drawing) {
+        let Line;
+        (function (Line) {
             // Describes a line end's head.
-            let EHeadStyle;
-            (function (EHeadStyle) {
-                EHeadStyle["None"] = "NONE";
-                EHeadStyle["Circle"] = "CIRCLE";
-                EHeadStyle["Arrow"] = "ARROW";
-            })(EHeadStyle = Drawing.EHeadStyle || (Drawing.EHeadStyle = {}));
-            let Line;
-            (function (Line) {
-                // Dictates where on a DIV an anchor should snap to.
-                let EAnchorDivSide;
-                (function (EAnchorDivSide) {
-                    EAnchorDivSide[EAnchorDivSide["TopLeft"] = 0] = "TopLeft";
-                    EAnchorDivSide[EAnchorDivSide["TopRight"] = 1] = "TopRight";
-                    EAnchorDivSide[EAnchorDivSide["BottomLeft"] = 2] = "BottomLeft";
-                    EAnchorDivSide[EAnchorDivSide["BottomRight"] = 3] = "BottomRight";
-                    EAnchorDivSide[EAnchorDivSide["Center"] = 4] = "Center";
-                    EAnchorDivSide[EAnchorDivSide["CenterLeft"] = 5] = "CenterLeft";
-                    EAnchorDivSide[EAnchorDivSide["CenterRight"] = 6] = "CenterRight";
-                    EAnchorDivSide[EAnchorDivSide["CenterTop"] = 7] = "CenterTop";
-                    EAnchorDivSide[EAnchorDivSide["CenterBottom"] = 8] = "CenterBottom";
-                })(EAnchorDivSide = Line.EAnchorDivSide || (Line.EAnchorDivSide = {}));
-                // Dictates what end of the line an anchor should render on.
-                let EAnchorLineSide;
-                (function (EAnchorLineSide) {
-                    EAnchorLineSide[EAnchorLineSide["Start"] = 0] = "Start";
-                    EAnchorLineSide[EAnchorLineSide["End"] = 1] = "End";
-                })(EAnchorLineSide = Line.EAnchorLineSide || (Line.EAnchorLineSide = {}));
-                Line.DEFAULT = {
-                    brushColor: "rgba(255, 255, 255, 1)",
-                    brushSize: 4,
-                    path: null,
-                    pathType: "LINE",
-                    transform: null,
-                    snaps: null,
-                    id: null
-                };
-            })(Line = Drawing.Line || (Drawing.Line = {}));
-            let FreePaint;
-            (function (FreePaint) {
-                FreePaint.DEFAULT = {
-                    brushColor: "rgba(255, 255, 255, 1)",
-                    brushSize: 4,
-                    path: null,
-                    pathType: "PLAIN",
-                    transform: null,
-                    id: null
-                };
-            })(FreePaint = Drawing.FreePaint || (Drawing.FreePaint = {}));
-        })(Drawing = Markup.Drawing || (Markup.Drawing = {}));
-        let Entity3d;
-        (function (Entity3d) {
-            let Polygon;
-            (function (Polygon) {
-                // Determines if terrain and 3d models should be overlapped or not.
-                let EClassificationType;
-                (function (EClassificationType) {
-                    // 3d models and terrain are overlapped.
-                    EClassificationType["Both"] = "BOTH";
-                    // Only terrain is overlapped.
-                    EClassificationType["Terrain"] = "TERRAIN";
-                })(EClassificationType = Polygon.EClassificationType || (Polygon.EClassificationType = {}));
-                Polygon.DEFAULT = {
-                    type: "POLYGON",
-                    id: null,
-                    positions: null,
-                    color: "rgba(254, 234, 57, 0.54)",
-                    outlineColor: "rgba(215, 215, 215, 0)",
-                    outlineWidth: 2,
-                    extrudedHeight: 0,
-                    classificationType: EClassificationType.Both,
-                    smoothen: 0
-                };
-            })(Polygon = Entity3d.Polygon || (Entity3d.Polygon = {}));
-            let Polyline;
-            (function (Polyline) {
-                Polyline.DEFAULT = {
-                    type: "POLYLINE",
-                    id: null,
-                    positions: null,
-                    color: "rgba(254, 234, 57, 0.54)",
-                    outlineWidth: 4,
-                    smoothen: 0
-                };
-            })(Polyline = Entity3d.Polyline || (Entity3d.Polyline = {}));
-            let Circle;
-            (function (Circle) {
-                Circle.DEFAULT = {
-                    type: "CIRCLE",
-                    id: null,
-                    position: null,
-                    radius: 50,
-                    color: "rgba(254, 234, 57, 0.54)"
-                };
-            })(Circle = Entity3d.Circle || (Entity3d.Circle = {}));
-        })(Entity3d = Markup.Entity3d || (Markup.Entity3d = {}));
+            let ELineHead;
+            (function (ELineHead) {
+                ELineHead["None"] = "NONE";
+                ELineHead["Circle"] = "CIRCLE";
+                ELineHead["Arrow"] = "ARROW";
+            })(ELineHead = Line.ELineHead || (Line.ELineHead = {}));
+            // Dictates where on a DIV an anchor should snap to.
+            let EAnchorDivSide;
+            (function (EAnchorDivSide) {
+                EAnchorDivSide[EAnchorDivSide["TopLeft"] = 0] = "TopLeft";
+                EAnchorDivSide[EAnchorDivSide["TopRight"] = 1] = "TopRight";
+                EAnchorDivSide[EAnchorDivSide["BottomLeft"] = 2] = "BottomLeft";
+                EAnchorDivSide[EAnchorDivSide["BottomRight"] = 3] = "BottomRight";
+                EAnchorDivSide[EAnchorDivSide["Center"] = 4] = "Center";
+                EAnchorDivSide[EAnchorDivSide["CenterLeft"] = 5] = "CenterLeft";
+                EAnchorDivSide[EAnchorDivSide["CenterRight"] = 6] = "CenterRight";
+                EAnchorDivSide[EAnchorDivSide["CenterTop"] = 7] = "CenterTop";
+                EAnchorDivSide[EAnchorDivSide["CenterBottom"] = 8] = "CenterBottom";
+            })(EAnchorDivSide = Line.EAnchorDivSide || (Line.EAnchorDivSide = {}));
+            // Dictates what end of the line an anchor should render on.
+            let EAnchorLineSide;
+            (function (EAnchorLineSide) {
+                EAnchorLineSide[EAnchorLineSide["Start"] = 0] = "Start";
+                EAnchorLineSide[EAnchorLineSide["End"] = 1] = "End";
+            })(EAnchorLineSide = Line.EAnchorLineSide || (Line.EAnchorLineSide = {}));
+            Line.DEFAULT = {
+                brushColor: "rgba(255, 255, 255, 1)",
+                brushSize: 4,
+                path: null,
+                pathType: "LINE",
+                transform: null,
+                snaps: null,
+                id: null
+            };
+        })(Line = Markup.Line || (Markup.Line = {}));
+        let FreePaint;
+        (function (FreePaint) {
+            // Describes a free-paint end's head.
+            let EPaintHead;
+            (function (EPaintHead) {
+                EPaintHead["None"] = "NONE";
+                EPaintHead["Circle"] = "CIRCLE";
+                EPaintHead["Arrow"] = "ARROW";
+            })(EPaintHead = FreePaint.EPaintHead || (FreePaint.EPaintHead = {}));
+            FreePaint.DEFAULT = {
+                brushColor: "rgba(255, 255, 255, 1)",
+                brushSize: 4,
+                path: null,
+                pathType: "PLAIN",
+                transform: null,
+                id: null
+            };
+        })(FreePaint = Markup.FreePaint || (Markup.FreePaint = {}));
+        let Polygon;
+        (function (Polygon) {
+            // Determines if terrain and 3d models should be overlapped or not.
+            let EClassificationType;
+            (function (EClassificationType) {
+                // 3d models and terrain are overlapped.
+                EClassificationType["Both"] = "BOTH";
+                // Only terrain is overlapped.
+                EClassificationType["Terrain"] = "TERRAIN";
+            })(EClassificationType = Polygon.EClassificationType || (Polygon.EClassificationType = {}));
+            Polygon.DEFAULT = {
+                type: "POLYGON",
+                id: null,
+                positions: null,
+                color: "rgba(254, 234, 57, 0.54)",
+                outlineColor: "rgba(215, 215, 215, 0)",
+                outlineWidth: 2,
+                extrudedHeight: 0,
+                classificationType: EClassificationType.Both,
+                smoothen: 0
+            };
+        })(Polygon = Markup.Polygon || (Markup.Polygon = {}));
+        let Polyline;
+        (function (Polyline) {
+            Polyline.DEFAULT = {
+                type: "POLYLINE",
+                id: null,
+                positions: null,
+                color: "rgba(254, 234, 57, 0.54)",
+                outlineWidth: 4,
+                smoothen: 0
+            };
+        })(Polyline = Markup.Polyline || (Markup.Polyline = {}));
+        let Circle;
+        (function (Circle) {
+            Circle.DEFAULT = {
+                type: "CIRCLE",
+                id: null,
+                position: null,
+                radius: 50,
+                color: "rgba(254, 234, 57, 0.54)"
+            };
+        })(Circle = Markup.Circle || (Markup.Circle = {}));
     })(exports.Markup || (exports.Markup = {}));
 
     exports.AbstractApi = AbstractApi;