bruce-models 1.3.7 → 1.3.9

package/dist/bruce-models.es5.js

@@ -107,10 +107,6 @@ var Api;
      */
     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 @@ var AnnDocument;
     (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 @@ var AnnDocument;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`documentView/${docId}`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, 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}`, Api.PrepReqParams(reqParams));
+                    res({
+                        document: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, 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 @@ var AnnDocument;
                 try {
                     const url = "documentViews" + (type ? "?type=" + type : "");
                     const data = yield api.GET(url, Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        documents: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -198,8 +208,9 @@ var CustomForm;
         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.");
             }
@@ -207,14 +218,25 @@ var CustomForm;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`customForm/${id}`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(GetCacheKey(id), req, 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}`, Api.PrepReqParams(reqParams));
+                    res({
+                        form: data
+                    });
+                }
+                catch (err) {
+                    rej(err);
+                }
+            }));
+            api.Cache.Set(GetCacheKey(id), prom, 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.");
             }
@@ -223,8 +245,9 @@ var CustomForm;
         });
     }
     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) {
@@ -232,21 +255,26 @@ var CustomForm;
             }
             const req = api.GET(url, Api.PrepReqParams(reqParams));
             const prom = req.then((data) => {
-                return data.Items;
+                return {
+                    forms: data.Items
+                };
             });
             api.Cache.Set(GetListCacheKey(typeId), prom, 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, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(`customForm/${data.ID}`, data, Api.PrepReqParams(reqParams));
             api.Cache.RemoveByStartsWith(Api.ECacheKey.CustomForm);
-            return data;
+            return {
+                form: res
+            };
         });
     }
     CustomForm.Update = Update;
@@ -438,15 +466,26 @@ class CacheControl {
     }
 }
 
-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 = 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 {
@@ -487,7 +526,6 @@ class AbstractApi {
         this.ssidHeader = value;
     }
     get(url, params) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!params) {
                 params = {};
@@ -500,11 +538,10 @@ class AbstractApi {
             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 = {};
@@ -515,11 +552,10 @@ class AbstractApi {
                 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 = {};
@@ -537,11 +573,10 @@ class AbstractApi {
                 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 = {};
@@ -559,7 +594,7 @@ class AbstractApi {
                 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) {
@@ -659,20 +694,25 @@ var Account;
         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, Api.DEFAULT_CACHE_DURATION);
-            return req;
+            const resData = {
+                account: req
+            };
+            api.Cache.Set(GetCacheKey(id), resData, 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;
@@ -682,7 +722,9 @@ var Account;
                 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);
@@ -693,8 +735,9 @@ var Account;
         });
     }
     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;
@@ -705,7 +748,9 @@ var Account;
                 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);
@@ -718,33 +763,28 @@ var Account;
     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(Api.ECacheKey.Account + 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.");
             }
@@ -756,14 +796,18 @@ var Account;
                 "DBLocation": region,
                 "StarterContent": starterContent
             };
-            const res = api.POST(`clientAccount/${id}`, reqData, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(`clientAccount/${id}`, reqData, 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;
@@ -771,7 +815,7 @@ var Account;
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET("config/regions", Api.PrepReqParams(reqParams));
-                    res(data.regions);
+                    res(data);
                 }
                 catch (e) {
                     rej(e);
@@ -984,7 +1028,11 @@ var BruceApi;
                     // Attempt to load an account specific base url.
                     // This could be one with a region specific endpoint.
                     try {
-                        const settings = yield Account.GetAppSettings(cam, this.accountId, Account.EAppId.BruceApi);
+                        const { settings } = yield Account.GetAppSettings({
+                            api: cam,
+                            accountId: this.accountId,
+                            appId: Account.EAppId.BruceApi
+                        });
                         if (this.loadCancelled) {
                             console.warn("BruceApi: Loading was cancelled due to SetBaseUrl being called, not setting regional base url.");
                             return;
@@ -1453,8 +1501,9 @@ var Entity;
         return `${Api.ECacheKey.Entity}${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.");
             }
@@ -1463,14 +1512,25 @@ var Entity;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`entity/${entityId}`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, 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}`, Api.PrepReqParams(reqParams));
+                    res({
+                        entity: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, 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.");
             }
@@ -1504,7 +1564,9 @@ var Entity;
                         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.
@@ -1515,12 +1577,15 @@ var Entity;
                     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.");
             }
@@ -1529,8 +1594,9 @@ var Entity;
         });
     }
     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.");
             }
@@ -1544,9 +1610,10 @@ var Entity;
         });
     }
     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.");
             }
@@ -1554,14 +1621,17 @@ var Entity;
                 data.Bruce = Object.assign(Object.assign({}, data.Bruce), { ID: ObjectUtils.UId() });
             }
             const reqUrl = `entity/${data.Bruce.ID}/?dataoverride=${override}&BruceEntityType=${data.Bruce["EntityType.ID"]}`;
-            data = yield api.POST(reqUrl, data, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(reqUrl, data, 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) {
@@ -1570,8 +1640,9 @@ var Entity;
         }
     }
     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);
@@ -1579,7 +1650,8 @@ var Entity;
         }
     }
     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];
@@ -1594,8 +1666,9 @@ var Entity;
         }
     }
     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;
@@ -1616,21 +1689,23 @@ var Entity;
     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 = PathUtils.Parse(pathStr);
-                const name = Entity.GetValue(entity, path);
+                const name = Entity.GetValue({
+                    entity: entity,
+                    path
+                });
                 if (name && typeof name != "object") {
                     return name;
                 }
@@ -1639,54 +1714,52 @@ var Entity;
         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 == 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, 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, 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 == 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, 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
+                }, Api.DEFAULT_CACHE_DURATION);
+            }
+            return {
+                entities: entities
+            };
+        });
+    }
+    Entity.GetList = GetList;
 })(Entity || (Entity = {}));
 
 function getVariable(str) {
@@ -1716,7 +1789,8 @@ var BruceVariable;
      * @param legacyParse
      * @returns
      */
-    function SwapValues(str, data, legacyParse) {
+    function SwapValues(params) {
+        let { str, entity: data, legacyParse } = params;
         if (!legacyParse) {
             legacyParse = false;
         }
@@ -1726,7 +1800,10 @@ var BruceVariable;
                 const path = legacyParse ? PathUtils.ParseLegacy(variable.path) : PathUtils.Parse(variable.path);
                 let value = "";
                 if (path.length > 0) {
-                    value = Entity.GetValue(data, path);
+                    value = Entity.GetValue({
+                        entity: data,
+                        path: path
+                    });
                 }
                 str = str.replace(variable.text, value);
             }
@@ -1881,7 +1958,10 @@ var Calculator;
     Calculator.GetColor = GetColor;
     function GetMappingValue(value, entity) {
         const attrPath = parseLegacyPath(value.field);
-        const eValue = Entity.GetValue(entity, attrPath);
+        let eValue = Entity.GetValue({
+            entity: entity,
+            path: attrPath
+        });
         const isValueNum = !isNaN(+eValue);
         for (let i = 0; i < value.values.length; i++) {
             const option = value.values[i];
@@ -1922,7 +2002,10 @@ var Calculator;
     Calculator.GetMappingValue = GetMappingValue;
     function GetGradientValue(value, entity) {
         const attrPath = parseLegacyPath(value.field);
-        let eValue = Entity.GetValue(entity, attrPath);
+        let eValue = Entity.GetValue({
+            entity: entity,
+            path: attrPath
+        });
         eValue = Math.min(Math.max(eValue, value.min), value.max);
         if (eValue < value.points[0].position) {
             return Color.ColorFromStr(value.points[0].color);
@@ -1951,7 +2034,10 @@ var Calculator;
     function GetInputValue(value, entity) {
         if (typeof value == "string") {
             try {
-                value = BruceVariable.SwapValues(value, entity);
+                value = BruceVariable.SwapValues({
+                    str: value,
+                    entity: entity
+                });
                 const eval2 = eval; // https://rollupjs.org/guide/en/#avoiding-eval
                 return eval2(value);
             }
@@ -2019,17 +2105,17 @@ var Geometry;
         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++) {
@@ -2488,8 +2574,9 @@ var EntityAttachmentType;
         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.");
             }
@@ -2499,20 +2586,24 @@ var EntityAttachmentType;
         });
     }
     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, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(`entityAttachmentType/${data.ID}`, data, 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;
@@ -2520,7 +2611,9 @@ var EntityAttachmentType;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET(`entityAttachmentTypes`, Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        attachmentTypes: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -2548,21 +2641,25 @@ var EntityAttachment;
         return Api.ECacheKey.Attachment + Api.ECacheKey.Entity + 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, Api.PrepReqParams(reqParams));
+            const res = yield api.PUT(url, data, 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.");
             }
@@ -2578,8 +2675,9 @@ var EntityAttachment;
         });
     }
     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.");
             }
@@ -2592,8 +2690,9 @@ var EntityAttachment;
         });
     }
     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.");
             }
@@ -2608,8 +2707,9 @@ var EntityAttachment;
         });
     }
     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.");
             }
@@ -2620,7 +2720,9 @@ var EntityAttachment;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET(`entity/${entityId}/attachments`, Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        attachments: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -2631,15 +2733,18 @@ var EntityAttachment;
         });
     }
     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;
@@ -2659,21 +2764,25 @@ var EntityComment;
         return Api.ECacheKey.Comment + Api.ECacheKey.Entity + 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, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
             api.Cache.RemoveByStartsWith(Api.ECacheKey.Comment + 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.");
             }
@@ -2683,8 +2792,9 @@ var EntityComment;
         });
     }
     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.");
             }
@@ -2695,7 +2805,9 @@ var EntityComment;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET(`entity/${entityId}/comments`, Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        comments: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -2722,21 +2834,25 @@ var EntityLink;
         return Api.ECacheKey.Link + Api.ECacheKey.Entity + 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, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
             api.Cache.RemoveByStartsWith(Api.ECacheKey.Link + 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.");
             }
@@ -2746,8 +2862,9 @@ var EntityLink;
         });
     }
     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.");
             }
@@ -2758,7 +2875,9 @@ var EntityLink;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET(`entity/${entityId}/links`, Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        links: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -2791,7 +2910,8 @@ var EntityLod;
         return Api.ECacheKey.Lod + 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.");
         }
@@ -2805,11 +2925,14 @@ var EntityLod;
         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.");
             }
@@ -2820,7 +2943,9 @@ var EntityLod;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const record = yield api.get(url, Api.PrepReqParams(reqParams));
-                    res(record["ClientFile.ID"]);
+                    res({
+                        clientFileId: record["ClientFile.ID"]
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -2831,19 +2956,23 @@ var EntityLod;
         });
     }
     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.");
             }
@@ -2855,7 +2984,9 @@ var EntityLod;
             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);
@@ -2868,13 +2999,11 @@ var EntityLod;
     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";
             }
@@ -2887,7 +3016,9 @@ var EntityLod;
             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);
@@ -2898,8 +3029,9 @@ var EntityLod;
         });
     }
     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.");
             }
@@ -2912,8 +3044,9 @@ var EntityLod;
         });
     }
     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.");
             }
@@ -2940,8 +3073,9 @@ var EntityLodCategory;
         return 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;
@@ -2949,7 +3083,9 @@ var EntityLodCategory;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET("lodCategories", Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        categories: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -2960,8 +3096,9 @@ var EntityLodCategory;
         });
     }
     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.");
             }
@@ -2972,7 +3109,9 @@ var EntityLodCategory;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET(`lodCategory/${id}`, Api.PrepReqParams(reqParams));
-                    res(data);
+                    res({
+                        category: data
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -2983,8 +3122,9 @@ var EntityLodCategory;
         });
     }
     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.");
             }
@@ -2994,15 +3134,18 @@ var EntityLodCategory;
         });
     }
     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, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(`lodCategory/${data.Key}`, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.Key));
             api.Cache.Remove(GetListCacheKey());
-            return data;
+            return {
+                category: res
+            };
         });
     }
     EntityLodCategory.Update = Update;
@@ -3022,8 +3165,9 @@ var EntityRelationType;
         return 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.");
             }
@@ -3032,14 +3176,25 @@ var EntityRelationType;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`entityRelationType/${typeId}`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, 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}`, Api.PrepReqParams(reqParams));
+                    res({
+                        relationType: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, 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.");
             }
@@ -3049,8 +3204,9 @@ var EntityRelationType;
         });
     }
     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;
@@ -3058,7 +3214,9 @@ var EntityRelationType;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET("entityRelationTypes", Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        relationTypes: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -3069,18 +3227,21 @@ var EntityRelationType;
         });
     }
     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 = ObjectUtils.UId();
             }
-            data = yield api.POST(`entityRelationType/${data.ID}`, data, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(`entityRelationType/${data.ID}`, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
             api.Cache.Remove(GetListCacheKey());
-            return data;
+            return {
+                relationType: res
+            };
         });
     }
     EntityRelationType.Update = Update;
@@ -3103,14 +3264,15 @@ var EntityRelation;
     EntityRelation.GetEntityCacheKey = GetEntityCacheKey;
     function GetListCacheKey(entityId, params) {
         return Api.ECacheKey.Relation + Api.ECacheKey.RelationType +
-            Api.ECacheKey.Id + params.typeId +
+            Api.ECacheKey.Id + params.relationTypeId +
             Api.ECacheKey.Id + params.oneWayOnly +
             Api.ECacheKey.Id + params.loadEntityData +
             Api.ECacheKey.Entity + 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.");
             }
@@ -3128,54 +3290,61 @@ var EntityRelation;
         });
     }
     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, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
             api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Principal.Entity.ID"]);
             api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Related.Entity.ID"]);
             api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType + Api.ECacheKey.Id + data["Relation.Type.ID"]);
             if (data["Data.Entity.ID"]) {
                 api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Entity + 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, 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.");
             }
@@ -3183,9 +3352,19 @@ var EntityRelation;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`entity/relation/${entityId}/dataentity`, 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`, Api.PrepReqParams(reqParams));
+                    res({
+                        relation: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(GetEntityCacheKey(entityId), prom);
+            return prom;
         });
     }
     EntityRelation.GetByDataEntityId = GetByDataEntityId;
@@ -3202,8 +3381,9 @@ var EntitySource;
         return `${Api.ECacheKey.EntitySource}${Api.ECacheKey.Id}${sourceId}${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.");
             }
@@ -3212,14 +3392,25 @@ var EntitySource;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`entitysource/${sourceId}/${sourceKey}`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, 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}`, Api.PrepReqParams(reqParams));
+                    res({
+                        source: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, 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.");
             }
@@ -3258,18 +3449,26 @@ var EntitySource;
                     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++) {
@@ -3280,7 +3479,9 @@ var EntitySource;
                     }
                 }
             }
-            return result;
+            return {
+                idMapping: result
+            };
         });
     }
     EntitySource.GetEntityIdsBySourceKeys = GetEntityIdsBySourceKeys;
@@ -3304,18 +3505,26 @@ var EntityTag;
         return 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.");
             }
@@ -3357,12 +3566,15 @@ var EntityTag;
                     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;
@@ -3370,7 +3582,9 @@ var EntityTag;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET(entityTypeId ? `entityType/${entityTypeId}/layers` : "layers", Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        tags: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -3381,8 +3595,9 @@ var EntityTag;
         });
     }
     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.");
             }
@@ -3392,16 +3607,19 @@ var EntityTag;
         });
     }
     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, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
             api.Cache.RemoveByStartsWith(GetListCacheKey());
-            return data;
+            return {
+                tag: res
+            };
         });
     }
     EntityTag.Update = Update;
@@ -3422,8 +3640,9 @@ var EntityType;
         return 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.");
             }
@@ -3432,14 +3651,25 @@ var EntityType;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`entitytype/${typeId}`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, 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}`, Api.PrepReqParams(reqParams));
+                    res({
+                        entityType: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, 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.");
             }
@@ -3449,8 +3679,9 @@ var EntityType;
         });
     }
     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;
@@ -3458,7 +3689,9 @@ var EntityType;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET("entitytypes", Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        entityTypes: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -3469,8 +3702,9 @@ var EntityType;
         });
     }
     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 = {};
             }
@@ -3480,10 +3714,12 @@ var EntityType;
             if (!data.Name) {
                 data.Name = data.ID;
             }
-            data = yield api.POST(`entitytype/${data.ID}`, data, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(`entitytype/${data.ID}`, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
             api.Cache.Remove(GetListCacheKey());
-            return data;
+            return {
+                entityType: res
+            };
         });
     }
     EntityType.Update = Update;
@@ -3889,18 +4125,21 @@ var EntityFilterGetter;
                         continue;
                     }
                     try {
-                        const page = yield Entity.Filter.V1.GetList(this.api, {
-                            pageSize: PAGE_SIZE,
-                            pageIndex: curCell.FetchPageIndex,
-                            entityTypeId: this.typeId,
-                            layerIds: this.tagIds,
-                            bounds: curCell.GetBounds(),
-                            sortOrder: Api.ESortOrder.Asc,
-                            entityTypeConditions: this.attrFilter
+                        const { entities } = yield Entity.GetList({
+                            api: this.api,
+                            filter: {
+                                pageSize: PAGE_SIZE,
+                                pageIndex: curCell.FetchPageIndex,
+                                entityTypeId: this.typeId,
+                                layerIds: this.tagIds,
+                                bounds: curCell.GetBounds(),
+                                sortOrder: 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;
@@ -3910,15 +4149,15 @@ var EntityFilterGetter;
                             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;
                             }
@@ -4078,22 +4317,38 @@ var EntityCoords;
         return Api.ECacheKey.EntityCoords + Api.ECacheKey.Entity + 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, 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, 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 || `${MathUtils.Round(point.latitude, 4)}, ${MathUtils.Round(point.longitude, 4)}`;
@@ -4115,15 +4370,22 @@ var EntityCoords;
             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;
@@ -4143,14 +4405,21 @@ var EntityCoords;
             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`, {
@@ -4162,12 +4431,15 @@ var EntityCoords;
             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);
         });
     }
@@ -4222,16 +4494,19 @@ var ClientFile;
         return `${Api.ECacheKey.ClientFile}${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.");
             }
@@ -4240,14 +4515,25 @@ var ClientFile;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`file/${fileId}/details`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, 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`, Api.PrepReqParams(reqParams));
+                    res({
+                        clientFile: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, 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.");
             }
@@ -4262,8 +4548,9 @@ var ClientFile;
         });
     }
     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.");
             }
@@ -4273,30 +4560,42 @@ var ClientFile;
                     "Purpose": purpose
                 };
             }
-            const params = Api.PrepReqParams(reqParams);
-            params.formData = formData;
-            return api.UPLOAD("file/uploadNew", file, params);
+            const reqParams = 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 = Api.PrepReqParams(reqParams);
-                    const data = yield api.UPLOAD("file/uploadTemp", file, params);
-                    res(data["TempFile.ID"]);
+                    const reqParams = Api.PrepReqParams(req);
+                    const data = yield api.UPLOAD("file/uploadTemp", file, reqParams);
+                    res({
+                        tempFileId: data["TempFile.ID"]
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -4308,38 +4607,37 @@ var ClientFile;
     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, 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, Api.PrepReqParams(reqParams));
+            return {
+                clientFiles: data.Items
+            };
+        });
+    }
+    ClientFile.GetList = GetList;
     let Processor;
     (function (Processor) {
         let EConvertExt;
@@ -4347,8 +4645,9 @@ var ClientFile;
             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.");
                 }
@@ -4383,8 +4682,9 @@ var ProgramKey;
         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.");
             }
@@ -4393,14 +4693,25 @@ var ProgramKey;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`programkey/${programId}`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, 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}`, Api.PrepReqParams(reqParams));
+                    res({
+                        programKey: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, 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;
@@ -4408,7 +4719,9 @@ var ProgramKey;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET("programkeys", Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        programKeys: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -4419,8 +4732,9 @@ var ProgramKey;
         });
     }
     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.");
             }
@@ -4430,15 +4744,18 @@ var ProgramKey;
         });
     }
     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, Api.PrepReqParams(reqParams));
+            const res = yield api.POST("programkey", data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ProgramId));
             api.Cache.Remove(GetListCacheKey());
-            return data;
+            return {
+                programKey: res
+            };
         });
     }
     ProgramKey.Update = Update;
@@ -4497,8 +4814,9 @@ var Tileset;
         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.");
             }
@@ -4506,14 +4824,25 @@ var Tileset;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`tileset/get/${tilesetId}?noFiles=${loadFiles ? 0 : 1}`, reqParams);
-            api.Cache.Set(GetCacheKey(tilesetId, loadFiles), req, 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, 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;
@@ -4521,7 +4850,9 @@ var Tileset;
             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);
@@ -4532,8 +4863,9 @@ var Tileset;
         });
     }
     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.");
             }
@@ -4543,8 +4875,9 @@ var Tileset;
         });
     }
     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.");
             }
@@ -4556,22 +4889,25 @@ var Tileset;
             yield api.POST(`tileset/update/${data.id}`, data, Api.PrepReqParams(reqParams));
             api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset + Api.ECacheKey.Id + data.id);
             api.Cache.RemoveByStartsWith(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 = Api.PrepReqParams(reqParams);
-            return api.UPLOAD(`tileset/uploadFile/${tilesetId}/files`, file, params);
+            return api.UPLOAD(`tileset/uploadFile/${tilesetId}/files`, file, 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.");
             }
@@ -4580,19 +4916,20 @@ var Tileset;
         });
     }
     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 = Api.PrepReqParams(reqParams);
-            yield api.UPLOAD(`tileset/uploadFile/${tilesetId}/src`, file, params);
+            yield api.UPLOAD(`tileset/uploadFile/${tilesetId}/src`, file, 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.");
             }
@@ -4601,7 +4938,8 @@ var Tileset;
         });
     }
     Tileset.DeleteSrcFile = DeleteSrcFile;
-    function GetFileUrl(api, tilesetId, file) {
+    function GetFileUrl(params) {
+        let { api, tilesetId, file } = params;
         if (!tilesetId) {
             throw ("Tileset ID is required.");
         }
@@ -4611,7 +4949,8 @@ var Tileset;
         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.");
         }
@@ -4621,7 +4960,8 @@ var Tileset;
         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.");
         }
@@ -4631,13 +4971,16 @@ var Tileset;
         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}`, Api.PrepReqParams(reqParams));
-            return res.ID;
+            return {
+                pendingActionId: res.ID
+            };
         });
     }
     Tileset.Generate = Generate;
@@ -4650,8 +4993,9 @@ var Tileset;
             return Api.ECacheKey.PublishTileset + Api.ECacheKey.Id + accountId + 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.");
                 }
@@ -4666,12 +5010,15 @@ var Tileset;
                 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.");
                 }
@@ -4679,14 +5026,25 @@ var Tileset;
                 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.");
                 }
@@ -4697,7 +5055,9 @@ var Tileset;
                 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);
@@ -4709,6 +5069,23 @@ var Tileset;
         }
         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 = {}));
 })(Tileset || (Tileset = {}));
 
 /**
@@ -4840,16 +5217,17 @@ var ProjectViewBookmark;
     // 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.");
             }
@@ -4858,14 +5236,25 @@ var ProjectViewBookmark;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`ui.view/${viewId}/slide/${bookmarkId}`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, 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}`, Api.PrepReqParams(reqParams));
+                    res({
+                        bookmark: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, 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.");
             }
@@ -4875,8 +5264,9 @@ var ProjectViewBookmark;
         });
     }
     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.");
             }
@@ -4894,11 +5284,15 @@ var ProjectViewBookmark;
                     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, Api.DEFAULT_CACHE_DURATION);
                     }
-                    res(items);
+                    res({
+                        bookmarks: items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -4909,20 +5303,24 @@ var ProjectViewBookmark;
         });
     }
     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, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(`ui.view/${viewId}/slide/${data.ID ? data.ID : ""}`, data, 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
@@ -4952,16 +5350,17 @@ var ProjectView;
     // 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.");
             }
@@ -4970,34 +5369,48 @@ var ProjectView;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`ui.view/${viewId}`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, 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}`, Api.PrepReqParams(reqParams));
+                    res({
+                        view: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, 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", Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        views: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), req, Api.DEFAULT_CACHE_DURATION);
-            return req;
+            api.Cache.Set(GetListCacheKey(), prom, 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.");
             }
@@ -5007,8 +5420,9 @@ var ProjectView;
         });
     }
     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 = {};
             }
@@ -5030,7 +5444,9 @@ var ProjectView;
             }
             api.Cache.Remove(GetCacheKey(data.ID));
             api.Cache.Remove(GetListCacheKey());
-            return data;
+            return {
+                view: data
+            };
         });
     }
     ProjectView.Update = Update;
@@ -5039,7 +5455,11 @@ var ProjectView;
 function getTemplateSettings(apiGetter, reqParams) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const view = yield ProjectView.Get(apiGetter.getApi(Api.TEMPLATE_ACCOUNT_ID), "default", reqParams);
+        const { view } = yield ProjectView.Get({
+            api: apiGetter.getApi(Api.TEMPLATE_ACCOUNT_ID),
+            viewId: "default",
+            req: reqParams
+        });
         return (_a = view.Settings) !== null && _a !== void 0 ? _a : {};
     });
 }
@@ -5062,29 +5482,35 @@ function checkSourceToTemplate(items, templateItem, addIfMissing) {
  */
 var ProjectViewLegacyTile;
 (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;
@@ -5221,24 +5647,32 @@ var PendingAction;
         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}`, Api.PrepReqParams(reqParams));
+            const data = yield api.GET(`pendingAction/${actionId}`, 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}`, Api.PrepReqParams(reqParams));
-            return data.Items;
+            const { api, stricter, reqParams } = params;
+            const data = yield api.GET(`pendingActions/important?Update=${Boolean(stricter)}`, 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;
             }
@@ -5250,7 +5684,9 @@ var PendingAction;
             }
             const args = `?SortOrder=${order == Api.ESortOrder.Desc ? "DESC" : "ASC"}&PageSize=${amount}&PageIndex=${startIndex}`;
             const data = yield api.GET(`pendingAction/${actionId}/progressMessages` + args, Api.PrepReqParams(reqParams));
-            return data.Items;
+            return {
+                messages: data.Items
+            };
         });
     }
     PendingAction.GetMessages = GetMessages;
@@ -5284,25 +5720,29 @@ var Style;
         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", Api.PrepReqParams(reqParams));
-                res(data.Items);
+                res({
+                    styles: data.Items
+                });
             }
             catch (e) {
                 rej(e);
             }
         }));
-        api.Cache.Set(GetListCacheKey(), req, Api.DEFAULT_CACHE_DURATION);
-        return req;
+        api.Cache.Set(GetListCacheKey(), res, 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.");
         }
@@ -5310,28 +5750,42 @@ var Style;
         if (cacheData) {
             return cacheData;
         }
-        const req = api.GET(`ui.entityDisplaySetting/${id}`, Api.PrepReqParams(reqParams));
-        api.Cache.Set(GetCacheKey(id), req, 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}`, Api.PrepReqParams(reqParams));
+                res({
+                    style: data
+                });
+            }
+            catch (e) {
+                rej(e);
+            }
+        }));
+        api.Cache.Set(GetCacheKey(id), prom, 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, Api.PrepReqParams(reqParams));
+            const res = yield api.POST(`ui.entityDisplaySetting/${data.ID}`, data, 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.");
             }
@@ -5343,37 +5797,6 @@ var Style;
     Style.Delete = Delete;
 })(Style || (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.
- */
-var TilesetEntitiesMapTiles;
-(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 = {}));
-})(TilesetEntitiesMapTiles || (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.
- */
-var TilesetExtMapTiles;
-(function (TilesetExtMapTiles) {
-    let EType;
-    (function (EType) {
-        EType["TileMapImagery"] = "TileMapImagery";
-        EType["OpenStreetMapImagery"] = "OpenStreetMapImagery";
-        EType["MapBoxImagery"] = "MapBoxImagery";
-        EType["CesiumIon"] = "CesiumIon";
-    })(EType = TilesetExtMapTiles.EType || (TilesetExtMapTiles.EType = {}));
-})(TilesetExtMapTiles || (TilesetExtMapTiles = {}));
-
 var Permission;
 (function (Permission) {
     let EPerm;
@@ -5402,8 +5825,9 @@ var Session;
     function GetCacheKey(sessionId) {
         return `${Api.ECacheKey.Session}${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.");
             }
@@ -5412,14 +5836,25 @@ var Session;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`session/${sessionId}`, reqParams);
-            api.Cache.Set(key, req, 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, 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.");
             }
@@ -5432,12 +5867,15 @@ var Session;
             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);
@@ -5447,8 +5885,9 @@ var Session;
         });
     }
     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.");
         }
@@ -5472,8 +5911,9 @@ var Session;
         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.");
         }
@@ -5482,12 +5922,19 @@ var Session;
         return accessPerms.findIndex(x => x.toLocaleUpperCase() == perm) > -1;
     }
     Session.IsSuperPermEnabled = IsSuperPermEnabled;
-    function IsAccountAdmin(session, accountId) {
-        return IsPermEnabled(session, accountId, Permission.EPerm.ADMIN);
+    function IsAccountAdmin(params) {
+        return IsPermEnabled({
+            perm: Permission.EPerm.ADMIN,
+            accountId: params.accountId,
+            session: params.session
+        });
     }
     Session.IsAccountAdmin = IsAccountAdmin;
-    function IsSuperAdmin(session) {
-        return IsSuperPermEnabled(session, Permission.EPerm.ADMIN);
+    function IsSuperAdmin(params) {
+        return IsSuperPermEnabled({
+            session: params.session,
+            perm: Permission.EPerm.ADMIN
+        });
     }
     Session.IsSuperAdmin = IsSuperAdmin;
 })(Session || (Session = {}));
@@ -5498,47 +5945,61 @@ var Session;
  */
 var UserGroup;
 (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.");
             }
@@ -5546,13 +6007,16 @@ var UserGroup;
         });
     }
     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;
@@ -5590,8 +6054,9 @@ var User;
         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.");
             }
@@ -5601,13 +6066,16 @@ var User;
             }
             const req = yield api.GET(`user/${id}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
             api.Cache.Set(GetCacheKey(id, accountId), req, 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.");
             }
@@ -5624,7 +6092,7 @@ var User;
                     }
                 }
             }
-            data = yield api.POST(`user/${data.ID}`, data, reqParams);
+            const res = yield api.POST(`user/${data.ID}`, data, reqParams);
             api.Cache.RemoveByContains(Api.ECacheKey.User + Api.ECacheKey.Id + data.ID);
             if (data.Type == EType.AccessToken) {
                 api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
@@ -5632,7 +6100,9 @@ var User;
             else if (data.Type == EType.User) {
                 api.Cache.RemoveByStartsWith(Api.ECacheKey.User + Api.ECacheKey.Account);
             }
-            return data;
+            return {
+                user: res
+            };
         });
     }
     User.Update = Update;
@@ -5655,14 +6125,18 @@ var User;
                 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;
                         }
                     }
@@ -5697,8 +6171,9 @@ var User;
         });
     }
     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.");
             }
@@ -5706,7 +6181,9 @@ var User;
             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);
@@ -5722,8 +6199,9 @@ var User;
             return Api.ECacheKey.User + Api.ECacheKey.Account + 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.");
                 }
@@ -5733,12 +6211,15 @@ var User;
                 }
                 const req = yield api.GET(`userByEmail/${email}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
                 api.Cache.Set(GetEmailCacheKey(email, accountId), req, 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.");
                 }
@@ -5752,13 +6233,16 @@ var User;
                 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]);
                     }
@@ -5772,12 +6256,12 @@ var User;
         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.");
                 }
@@ -5789,12 +6273,12 @@ var User;
         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.");
                 }
@@ -5804,14 +6288,12 @@ var User;
         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.");
                 }
@@ -5824,19 +6306,20 @@ var User;
                 if (data.Email) {
                     api.Cache.RemoveByContains(Api.ECacheKey.User + 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.");
                 }
@@ -5846,7 +6329,9 @@ var User;
                 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);
@@ -5858,22 +6343,28 @@ var User;
         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;
@@ -5884,8 +6375,9 @@ var User;
             return Api.ECacheKey.AccessToken + Api.ECacheKey.Account + 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;
@@ -5893,13 +6385,16 @@ var User;
                 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]);
                     }
@@ -5909,16 +6404,18 @@ var User;
             });
         }
         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(Api.ECacheKey.User + Api.ECacheKey.Id + id);
                 api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + 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 = {};
                 }
@@ -5930,7 +6427,9 @@ var User;
                 }
                 data = yield api.POST("accessToken", data, reqParams);
                 api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
-                return data;
+                return {
+                    token: data
+                };
             });
         }
         AccessToken.Create = Create;
@@ -6023,13 +6522,13 @@ var UrlUtils;
         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}`);
                     }
@@ -6053,34 +6552,34 @@ var DataLab;
         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, 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, 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;
 })(DataLab || (DataLab = {}));
 
 /**
@@ -6089,15 +6588,17 @@ var DataLab;
  */
 var ImportCad;
 (function (ImportCad) {
-    function Analyze(api, params, reqParams) {
+    function Analyze(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return api.POST("entities/PrepareIFCForImport", params, Api.PrepReqParams(reqParams));
+            const { api, fileAnalyze, req: reqParams } = params;
+            return api.POST("entities/PrepareIFCForImport", fileAnalyze, 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, Api.PrepReqParams(reqParams));
+            const { api, fileImport, req: reqParams } = params;
+            return api.POST("entities/importIFCWithProgress", fileImport, Api.PrepReqParams(reqParams));
         });
     }
     ImportCad.ImportEntities = ImportEntities;
@@ -6124,9 +6625,10 @@ var ImportCad;
 
 var ImportCsv;
 (function (ImportCsv) {
-    function ImportEntities(api, params, reqParams) {
+    function ImportEntities(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return api.POST("entities/importCSVWithProgress2", params, Api.PrepReqParams(reqParams));
+            const { api, fileImport, req: reqParams } = params;
+            return api.POST("entities/importCSVWithProgress2", fileImport, Api.PrepReqParams(reqParams));
         });
     }
     ImportCsv.ImportEntities = ImportEntities;
@@ -6134,9 +6636,10 @@ var ImportCsv;
 
 var ImportJson;
 (function (ImportJson) {
-    function ImportEntities(api, params, reqParams) {
+    function ImportEntities(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return api.POST("entities/importJsonWithProgress", params, Api.PrepReqParams(reqParams));
+            const { api, fileImport, req: reqParams } = params;
+            return api.POST("entities/importJsonWithProgress", fileImport, Api.PrepReqParams(reqParams));
         });
     }
     ImportJson.ImportEntities = ImportEntities;
@@ -6144,9 +6647,10 @@ var ImportJson;
 
 var ImportKml;
 (function (ImportKml) {
-    function ImportEntities(api, params, reqParams) {
+    function ImportEntities(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return api.POST("entities/importKMLWithProgress2", params, Api.PrepReqParams(reqParams));
+            const { api, fileImport, req: reqParams } = params;
+            return api.POST("entities/importKMLWithProgress2", fileImport, Api.PrepReqParams(reqParams));
         });
     }
     ImportKml.ImportEntities = ImportEntities;
@@ -6167,8 +6671,9 @@ var ImportedFile;
         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;
             }
@@ -6192,7 +6697,9 @@ var ImportedFile;
             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);
@@ -6203,15 +6710,26 @@ var ImportedFile;
         });
     }
     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}`, Api.PrepReqParams(reqParams));
-            api.Cache.Set(GetCacheKey(fileId), req, 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}`, Api.PrepReqParams(reqParams));
+                    res({
+                        importedFile: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(GetCacheKey(fileId), prom, Api.DEFAULT_CACHE_DURATION);
+            return prom;
         });
     }
     ImportedFile.Get = Get;
@@ -6295,105 +6813,106 @@ var Markup;
             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 = {}));
 })(Markup || (Markup = {}));
 
-export { AnnDocument, CustomForm, CustomFormContent, AbstractApi, Api, BruceApi, CamApi, IdmApi, GlobalApi, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityGlobe, EntityFilterGetter, BatchedDataGetter, EntityCoords, EntityTypeVisualSettings, EntityAttribute, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, PendingAction, MessageBroker, Style, TilesetEntitiesMapTiles, TilesetExtMapTiles, Tileset, Permission, Session, UserGroup, User, Account, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup };
+export { AnnDocument, CustomForm, CustomFormContent, AbstractApi, Api, BruceApi, CamApi, IdmApi, GlobalApi, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityGlobe, EntityFilterGetter, BatchedDataGetter, EntityCoords, EntityTypeVisualSettings, EntityAttribute, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, PendingAction, MessageBroker, Style, Tileset, Permission, Session, UserGroup, User, Account, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup };
 //# sourceMappingURL=bruce-models.es5.js.map