bruce-models 6.6.1 → 6.6.3

package/dist/bruce-models.es5.js

@@ -35,6 +35,7 @@ var Api;
     (function (ECacheKey) {
         ECacheKey["Id"] = ":";
         ECacheKey["ListId"] = "::";
+        ECacheKey["FilterId"] = ":f:";
         ECacheKey["Assembly"] = "assembly";
         ECacheKey["Entity"] = "entity";
         ECacheKey["EntityType"] = "entitytype";
@@ -150,9 +151,63 @@ var Api;
     Api.PrepReqParams = PrepReqParams;
 })(Api || (Api = {}));
 
+/**
+ * A simple LRU cache implementation.
+ * LRU cache is a cache that evicts the least recently used item when it is full.
+ */
+class LRUCache {
+    constructor(capacity) {
+        this.capacity = capacity;
+        this.cache = new Map();
+    }
+    /**
+     * Get a value from the cache.
+     * @param key
+     * @returns
+     */
+    Get(key) {
+        const value = this.cache.get(key);
+        if (value) {
+            this.cache.delete(key);
+            this.cache.set(key, value);
+        }
+        return value;
+    }
+    /**
+     * Set a value in the cache.
+     * @param key
+     * @param value
+     */
+    Set(key, value) {
+        if (this.capacity <= 0) {
+            // Empty cache.
+            // Means we were configured to not cache anything.
+            this.cache.clear();
+            return;
+        }
+        else if (this.cache.size >= this.capacity) {
+            const leastRecentlyUsedKey = this.cache.keys().next().value;
+            this.cache.delete(leastRecentlyUsedKey);
+        }
+        this.cache.set(key, value);
+    }
+    Entries() {
+        return this.cache.entries();
+    }
+    Clear() {
+        this.cache.clear();
+    }
+    Delete(key) {
+        return this.cache.delete(key);
+    }
+    Keys() {
+        return this.cache.keys();
+    }
+}
+
 class CacheControl {
     constructor(id) {
-        this.memory = new Map();
+        this.memory = new LRUCache(20000);
         this.Disabled = false;
         if (!id) {
             id = "default";
@@ -179,7 +234,7 @@ class CacheControl {
             data,
             expires
         };
-        this.memory.set(id, record);
+        this.memory.Set(id, record);
     }
     /**
      * Returns the item with the given id.
@@ -191,7 +246,7 @@ class CacheControl {
             return null;
         }
         id = String(id);
-        let record = this.memory.get(id);
+        let record = this.memory.Get(id);
         if (!record) {
             return {
                 data: null,
@@ -199,7 +254,7 @@ class CacheControl {
             };
         }
         if (record.expires < Date.now()) {
-            this.memory.delete(id);
+            this.memory.Delete(id);
             return {
                 data: null,
                 found: false
@@ -214,7 +269,7 @@ class CacheControl {
      * Removes all items from the cache.
      */
     Clear() {
-        this.memory.clear();
+        this.memory.Clear();
     }
     /**
      * Removes the item with the given id.
@@ -222,7 +277,7 @@ class CacheControl {
      */
     Remove(id) {
         id = String(id);
-        this.memory.delete(id);
+        this.memory.Delete(id);
     }
     /**
      * Removes all items that match the callback.
@@ -230,10 +285,10 @@ class CacheControl {
      * @param callback
      */
     RemoveBy(callback) {
-        const memoryKeys = Array.from(this.memory.keys());
+        const memoryKeys = Array.from(this.memory.Keys());
         for (const key of memoryKeys) {
             if (callback(key)) {
-                this.memory.delete(key);
+                this.memory.Delete(key);
             }
         }
     }
@@ -6237,54 +6292,6 @@ function getTimezoneName(timezone) {
     return full;
 }
 
-/**
- * A simple LRU cache implementation.
- * LRU cache is a cache that evicts the least recently used item when it is full.
- */
-class LRUCache {
-    constructor(capacity) {
-        this.capacity = capacity;
-        this.cache = new Map();
-    }
-    /**
-     * Get a value from the cache.
-     * @param key
-     * @returns
-     */
-    Get(key) {
-        const value = this.cache.get(key);
-        if (value) {
-            this.cache.delete(key);
-            this.cache.set(key, value);
-        }
-        return value;
-    }
-    /**
-     * Set a value in the cache.
-     * @param key
-     * @param value
-     */
-    Set(key, value) {
-        if (this.capacity <= 0) {
-            // Empty cache.
-            // Means we were configured to not cache anything.
-            this.cache.clear();
-            return;
-        }
-        else if (this.cache.size >= this.capacity) {
-            const leastRecentlyUsedKey = this.cache.keys().next().value;
-            this.cache.delete(leastRecentlyUsedKey);
-        }
-        this.cache.set(key, value);
-    }
-    Entries() {
-        return this.cache.entries();
-    }
-    Clear() {
-        this.cache.clear();
-    }
-}
-
 /**
  * Describes the "Entity Attachment Type" concept within Nextspace.
  * It is a record that describes the purpose of an attachment.
@@ -6940,7 +6947,18 @@ var EntityLod;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const data = yield api.POST("entity/getlods", filter, reqParams);
+            const cacheKey = GetLodsFilterCacheKey(filter);
+            const cache = api.GetCacheItem(cacheKey, reqParams);
+            if (cache === null || cache === void 0 ? void 0 : cache.found) {
+                return cache.data;
+            }
+            const prom = api.POST("entity/getlods", filter, reqParams);
+            api.SetCacheItem({
+                key: cacheKey,
+                value: prom,
+                req: reqParams
+            });
+            const data = yield prom;
             return {
                 lods: data.Items
             };
@@ -7044,6 +7062,7 @@ var EntityLod;
                 "ClientFile.ID": params["ClientFile.ID"]
             }, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetEntityListKey(entityId));
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Lod + Api.ECacheKey.FilterId);
             return res;
         });
     }
@@ -7069,6 +7088,7 @@ var EntityLod;
                 Items: [{ "LODCategory.Key": lodCategoryId, "Level": level }]
             }, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetEntityListKey(entityId));
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Lod + Api.ECacheKey.FilterId);
         });
     }
     EntityLod.Delete = Delete;
@@ -7115,6 +7135,25 @@ var EntityLod;
         return Api.ECacheKey.Lod + Api.ECacheKey.Entity + entityId;
     }
     EntityLod.GetEntityListKey = GetEntityListKey;
+    /**
+     * Returns cache identifier for a GetLods filter.
+     * @param filter
+     * @returns
+     */
+    function GetLodsFilterCacheKey(filter) {
+        const filterStr = JSON.stringify({
+            strict: Boolean(filter.strict),
+            externalSources: Boolean(filter.externalSources),
+            items: filter.Items.map(item => ({
+                entityId: item.entityId || "",
+                categoryId: item.categoryId || "",
+                group: item.group || "DEFAULT",
+                level: item.level || 0
+            }))
+        });
+        return Api.ECacheKey.Lod + Api.ECacheKey.FilterId + btoa(filterStr);
+    }
+    EntityLod.GetLodsFilterCacheKey = GetLodsFilterCacheKey;
 })(EntityLod || (EntityLod = {}));
 
 /**
@@ -10069,18 +10108,22 @@ var Tileset;
      */
     function GetList(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, req: reqParams, assertLocation, expandSettings, type, pageIndex, pageSize, search, orderBy, sortOrder } = params;
+            let { api, req: reqParams, assertLocation, expandSettings, type, pageIndex, pageSize, search, orderBy, sortOrder, tilesetIds } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = pageSize ? null : api.GetCacheItem(GetListCacheKey({
-                assertLocation: assertLocation,
-                expandSettings: expandSettings,
-                type: type,
-                orderBy: orderBy,
-                sortOrder: sortOrder,
-                search: search
-            }), reqParams);
+            let cacheKey = null;
+            if (!(tilesetIds === null || tilesetIds === void 0 ? void 0 : tilesetIds.length) && !pageSize) {
+                cacheKey = GetListCacheKey({
+                    assertLocation: assertLocation,
+                    expandSettings: expandSettings,
+                    type: type,
+                    orderBy: orderBy,
+                    sortOrder: sortOrder,
+                    search: search
+                });
+            }
+            const cache = cacheKey ? api.GetCacheItem(cacheKey, reqParams) : null;
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -10111,6 +10154,9 @@ var Tileset;
                     if (sortOrder) {
                         urlParams.append("SortOrder", sortOrder);
                     }
+                    if (tilesetIds === null || tilesetIds === void 0 ? void 0 : tilesetIds.length) {
+                        urlParams.append("ID", tilesetIds.join(","));
+                    }
                     const data = yield api.GET("tileset/getList?" + urlParams.toString(), reqParams);
                     // Convert legacy records.
                     // Commented out because it spams :)
@@ -10131,16 +10177,9 @@ var Tileset;
                     rej(e);
                 }
             }));
-            if (!pageSize) {
+            if (cacheKey) {
                 api.SetCacheItem({
-                    key: GetListCacheKey({
-                        assertLocation: assertLocation,
-                        expandSettings: expandSettings,
-                        type: type,
-                        orderBy: orderBy,
-                        sortOrder: sortOrder,
-                        search: search
-                    }),
+                    key: cacheKey,
                     value: req,
                     req: reqParams
                 });
@@ -16393,7 +16432,7 @@ var Tracking;
 })(Tracking || (Tracking = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "6.6.1";
+const VERSION = "6.6.3";
 
 export { VERSION, Assembly, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, GeoJson, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, ProjectViewBookmarkGroup, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, UserMfaMethod, Account, AccountInvite, AccountFeatures, AccountLimits, AccountTemplate, AccountType, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, DataLabGroup, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, ExportBrz, ExportUsd, Markup, Uploader, Plugin, ENVIRONMENT, DataSource, Scenario, Tracking };
 //# sourceMappingURL=bruce-models.es5.js.map