bruce-models 1.3.6 → 1.3.8

package/dist/lib/entity/entity.js

@@ -24,8 +24,9 @@ var Entity;
         return `${api_1.Api.ECacheKey.Entity}${api_1.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.");
             }
@@ -34,14 +35,25 @@ var Entity;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`entity/${entityId}`, api_1.Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, api_1.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_1.Api.PrepReqParams(reqParams));
+                    res({
+                        entity: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, api_1.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.");
             }
@@ -86,12 +98,15 @@ var Entity;
                     reqs.push(prom);
                 }
             }
-            return (yield Promise.all(reqs)).filter(x => !!x);
+            return {
+                entities: (yield Promise.all(reqs)).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.");
             }
@@ -100,8 +115,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.");
             }
@@ -115,9 +131,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.");
             }
@@ -125,14 +142,17 @@ var Entity;
                 data.Bruce = Object.assign(Object.assign({}, data.Bruce), { ID: object_utils_1.ObjectUtils.UId() });
             }
             const reqUrl = `entity/${data.Bruce.ID}/?dataoverride=${override}&BruceEntityType=${data.Bruce["EntityType.ID"]}`;
-            data = yield api.POST(reqUrl, data, api_1.Api.PrepReqParams(reqParams));
+            const res = yield api.POST(reqUrl, data, api_1.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) {
@@ -141,8 +161,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);
@@ -150,7 +171,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];
@@ -165,8 +187,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;
@@ -187,21 +210,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 = path_utils_1.PathUtils.Parse(pathStr);
-                const name = Entity.GetValue(entity, path);
+                const name = Entity.GetValue({
+                    entity: entity,
+                    path
+                });
                 if (name && typeof name != "object") {
                     return name;
                 }
@@ -210,53 +235,49 @@ 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_1.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_1.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_1.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_1.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_1.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_1.Api.DEFAULT_CACHE_DURATION);
+            }
+            return {
+                entities: entities
+            };
+        });
+    }
+    Entity.GetList = GetList;
 })(Entity = exports.Entity || (exports.Entity = {}));
 //# sourceMappingURL=entity.js.map

package/dist/lib/entity/entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/entity/entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/entity/entity.ts"],"names":[],"mappings":"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"}

package/dist/lib/entity/getters/entity-filter-getter.js

@@ -230,18 +230,21 @@ var EntityFilterGetter;
                         continue;
                     }
                     try {
-                        const page = yield entity_1.Entity.Filter.V1.GetList(this.api, {
-                            pageSize: PAGE_SIZE,
-                            pageIndex: curCell.FetchPageIndex,
-                            entityTypeId: this.typeId,
-                            layerIds: this.tagIds,
-                            bounds: curCell.GetBounds(),
-                            sortOrder: api_1.Api.ESortOrder.Asc,
-                            entityTypeConditions: this.attrFilter
+                        const { entities } = yield entity_1.Entity.GetList({
+                            api: this.api,
+                            filter: {
+                                pageSize: PAGE_SIZE,
+                                pageIndex: curCell.FetchPageIndex,
+                                entityTypeId: this.typeId,
+                                layerIds: this.tagIds,
+                                bounds: curCell.GetBounds(),
+                                sortOrder: api_1.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;
@@ -251,15 +254,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;
                             }

package/dist/lib/entity/getters/entity-filter-getter.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-filter-getter.js","sourceRoot":"","sources":["../../../../src/entity/getters/entity-filter-getter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity-filter-getter.js","sourceRoot":"","sources":["../../../../src/entity/getters/entity-filter-getter.ts"],"names":[],"mappings":"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"}

package/dist/lib/import/import-cad.js

@@ -17,15 +17,17 @@ const api_1 = require("../api/api");
  */
 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_1.Api.PrepReqParams(reqParams));
+            const { api, fileAnalyze, req: reqParams } = params;
+            return api.POST("entities/PrepareIFCForImport", fileAnalyze, api_1.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_1.Api.PrepReqParams(reqParams));
+            const { api, fileImport, req: reqParams } = params;
+            return api.POST("entities/importIFCWithProgress", fileImport, api_1.Api.PrepReqParams(reqParams));
         });
     }
     ImportCad.ImportEntities = ImportEntities;

package/dist/lib/import/import-cad.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-cad.js","sourceRoot":"","sources":["../../../src/import/import-cad.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAGjC;;;GAGG;AACH,IAAiB,SAAS,CAsDzB;AAtDD,WAAiB,SAAS;IA6BtB,SAAsB,OAAO,CAAC,GAAiB,EAAE,MAAsB,EAAE,SAA0B;;YAC/F,OAAO,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE,MAAM,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1F,CAAC;KAAA;IAFqB,iBAAO,UAE5B,CAAA;IAED,SAAsB,cAAc,CAAC,GAAiB,EAAE,MAAqB,EAAE,SAA0B;;YACrG,OAAO,GAAG,CAAC,IAAI,CAAC,gCAAgC,EAAE,MAAM,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5F,CAAC;KAAA;IAFqB,wBAAc,iBAEnC,CAAA;IAED;;;;OAIG;IACH,SAAgB,WAAW,CAAC,QAAyB;;QACjD,IAAI;YACA,MAAM,GAAG,GAAG,OAAO,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC1E,UAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,0CAAE,MAAM,EAAE;gBACrB,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aACxB;SACJ;QACD,WAAM;YACF,wBAAwB;SAC3B;QACD,OAAY,IAAI,CAAC;IACrB,CAAC;IAXe,qBAAW,cAW1B,CAAA;AACL,CAAC,EAtDgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAsDzB"}
+{"version":3,"file":"import-cad.js","sourceRoot":"","sources":["../../../src/import/import-cad.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAGjC;;;GAGG;AACH,IAAiB,SAAS,CAgEzB;AAhED,WAAiB,SAAS;IA6BtB,SAAsB,OAAO,CAAC,MAI7B;;YACG,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;YACpD,OAAO,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE,WAAW,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/F,CAAC;KAAA;IAPqB,iBAAO,UAO5B,CAAA;IAED,SAAsB,cAAc,CAAC,MAIpC;;YACG,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;YACnD,OAAO,GAAG,CAAC,IAAI,CAAC,gCAAgC,EAAE,UAAU,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QAChG,CAAC;KAAA;IAPqB,wBAAc,iBAOnC,CAAA;IAED;;;;OAIG;IACH,SAAgB,WAAW,CAAC,QAAyB;;QACjD,IAAI;YACA,MAAM,GAAG,GAAG,OAAO,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC1E,UAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,0CAAE,MAAM,EAAE;gBACrB,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aACxB;SACJ;QACD,WAAM;YACF,wBAAwB;SAC3B;QACD,OAAY,IAAI,CAAC;IACrB,CAAC;IAXe,qBAAW,cAW1B,CAAA;AACL,CAAC,EAhEgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAgEzB"}

package/dist/lib/import/import-csv.js

@@ -13,9 +13,10 @@ exports.ImportCsv = void 0;
 const api_1 = require("../api/api");
 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_1.Api.PrepReqParams(reqParams));
+            const { api, fileImport, req: reqParams } = params;
+            return api.POST("entities/importCSVWithProgress2", fileImport, api_1.Api.PrepReqParams(reqParams));
         });
     }
     ImportCsv.ImportEntities = ImportEntities;

package/dist/lib/import/import-csv.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-csv.js","sourceRoot":"","sources":["../../../src/import/import-csv.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAGjC,IAAiB,SAAS,CA4BzB;AA5BD,WAAiB,SAAS;IAyBtB,SAAsB,cAAc,CAAC,GAAiB,EAAE,MAAqB,EAAE,SAA0B;;YACrG,OAAO,GAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE,MAAM,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7F,CAAC;KAAA;IAFqB,wBAAc,iBAEnC,CAAA;AACL,CAAC,EA5BgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QA4BzB"}
+{"version":3,"file":"import-csv.js","sourceRoot":"","sources":["../../../src/import/import-csv.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAGjC,IAAiB,SAAS,CAiCzB;AAjCD,WAAiB,SAAS;IAyBtB,SAAsB,cAAc,CAAC,MAIpC;;YACG,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;YACnD,OAAO,GAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE,UAAU,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QACjG,CAAC;KAAA;IAPqB,wBAAc,iBAOnC,CAAA;AACL,CAAC,EAjCgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAiCzB"}

package/dist/lib/import/import-json.js

@@ -13,9 +13,10 @@ exports.ImportJson = void 0;
 const api_1 = require("../api/api");
 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_1.Api.PrepReqParams(reqParams));
+            const { api, fileImport, req: reqParams } = params;
+            return api.POST("entities/importJsonWithProgress", fileImport, api_1.Api.PrepReqParams(reqParams));
         });
     }
     ImportJson.ImportEntities = ImportEntities;

package/dist/lib/import/import-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-json.js","sourceRoot":"","sources":["../../../src/import/import-json.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAIjC,IAAiB,UAAU,CAuB1B;AAvBD,WAAiB,UAAU;IAoBvB,SAAsB,cAAc,CAAC,GAAiB,EAAE,MAAqB,EAAE,SAA0B;;YACrG,OAAO,GAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE,MAAM,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7F,CAAC;KAAA;IAFqB,yBAAc,iBAEnC,CAAA;AACL,CAAC,EAvBgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAuB1B"}
+{"version":3,"file":"import-json.js","sourceRoot":"","sources":["../../../src/import/import-json.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAIjC,IAAiB,UAAU,CA4B1B;AA5BD,WAAiB,UAAU;IAoBvB,SAAsB,cAAc,CAAC,MAIpC;;YACG,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;YACnD,OAAO,GAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE,UAAU,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QACjG,CAAC;KAAA;IAPqB,yBAAc,iBAOnC,CAAA;AACL,CAAC,EA5BgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QA4B1B"}

package/dist/lib/import/import-kml.js

@@ -13,9 +13,10 @@ exports.ImportKml = void 0;
 const api_1 = require("../api/api");
 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_1.Api.PrepReqParams(reqParams));
+            const { api, fileImport, req: reqParams } = params;
+            return api.POST("entities/importKMLWithProgress2", fileImport, api_1.Api.PrepReqParams(reqParams));
         });
     }
     ImportKml.ImportEntities = ImportEntities;

package/dist/lib/import/import-kml.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-kml.js","sourceRoot":"","sources":["../../../src/import/import-kml.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAGjC,IAAiB,SAAS,CAgBzB;AAhBD,WAAiB,SAAS;IAatB,SAAsB,cAAc,CAAC,GAAiB,EAAE,MAAqB,EAAE,SAA0B;;YACrG,OAAO,GAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE,MAAM,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7F,CAAC;KAAA;IAFqB,wBAAc,iBAEnC,CAAA;AACL,CAAC,EAhBgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAgBzB"}
+{"version":3,"file":"import-kml.js","sourceRoot":"","sources":["../../../src/import/import-kml.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAGjC,IAAiB,SAAS,CAqBzB;AArBD,WAAiB,SAAS;IAatB,SAAsB,cAAc,CAAC,MAIpC;;YACG,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;YACnD,OAAO,GAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE,UAAU,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QACjG,CAAC;KAAA;IAPqB,wBAAc,iBAOnC,CAAA;AACL,CAAC,EArBgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAqBzB"}

package/dist/lib/import/imported-file.js

@@ -26,8 +26,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;
             }
@@ -51,7 +52,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);
@@ -62,15 +65,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_1.Api.PrepReqParams(reqParams));
-            api.Cache.Set(GetCacheKey(fileId), req, api_1.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_1.Api.PrepReqParams(reqParams));
+                    res({
+                        importedFile: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(GetCacheKey(fileId), prom, api_1.Api.DEFAULT_CACHE_DURATION);
+            return prom;
         });
     }
     ImportedFile.Get = Get;

package/dist/lib/import/imported-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"imported-file.js","sourceRoot":"","sources":["../../../src/import/imported-file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imported-file.js","sourceRoot":"","sources":["../../../src/import/imported-file.ts"],"names":[],"mappings":"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"}