bruce-models 6.4.8 → 6.5.0

package/dist/bruce-models.es5.js

@@ -5052,7 +5052,45 @@ var Calculator;
             }
             for (let i = 0; i < value.values.length; i++) {
                 const option = value.values[i];
-                const mapValue = option.fieldValue;
+                let mapValue = option.fieldValue;
+                // If mapValue is prefixed with "JS:", we evaluate it as JavaScript.
+                // This lets us do things like JS:Boolean("${}") as a quick way to map 'existence' to a target value.
+                if (typeof mapValue === "string" && mapValue.startsWith("JS:")) {
+                    try {
+                        let jsEval = mapValue.replace("JS:", "").trim();
+                        const attrPathStr = PathUtils.Wrap(attrPath);
+                        jsEval = jsEval.replace("${}", "${" + attrPathStr + "}");
+                        jsEval = BruceVariable.SwapValues({
+                            str: jsEval,
+                            entity: entity
+                        });
+                        // https://rollupjs.org/guide/en/#avoiding-eval
+                        // This stops eval warning.
+                        const eval2 = eval;
+                        mapValue = eval2(jsEval);
+                        // We currently expect eval to return a validity bool.
+                        // So it either matches and we return it, or it doesn't and we continue.
+                        if (mapValue) {
+                            return option.appliedValue;
+                        }
+                        else {
+                            continue;
+                        }
+                    }
+                    catch (exception) {
+                        const e = exception;
+                        let suppress = false;
+                        if (e && typeof e == "object") {
+                            const msg = e.message;
+                            suppress = !!msg && (msg.includes("Unexpected end") || msg.includes("got end of script"));
+                        }
+                        if (!suppress) {
+                            console.error(e);
+                        }
+                        // Eval failed, therefor not a valid mapping-row.
+                        continue;
+                    }
+                }
                 let isMapValueNum = !isNaN(+mapValue);
                 if (isMapValueNum == null) {
                     isMapValueNum = false;
@@ -5089,7 +5127,7 @@ var Calculator;
                     // Common as mapping value is typically a user-entered string.
                     else if (typeof eValue === "boolean" && typeof mapValue === "string") {
                         const eValueStr = eValue ? "true" : "false";
-                        if (mapValue == eValueStr) {
+                        if (mapValue.toLowerCase() == eValueStr) {
                             return option.appliedValue;
                         }
                     }
@@ -5097,7 +5135,7 @@ var Calculator;
                     // Have not seen this happen yet, but preparing for any future cases.
                     else if (typeof mapValue === "boolean" && typeof eValue === "string") {
                         const mapValueStr = mapValue ? "true" : "false";
-                        if (mapValueStr == eValue) {
+                        if (mapValueStr == eValue.toLowerCase()) {
                             return option.appliedValue;
                         }
                     }
@@ -11916,7 +11954,8 @@ var Account;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = api.GetCacheItem(GetCacheKey(id), reqParams);
+            const cacheKey = GetCacheKey(api.GetSessionId(), id);
+            const cache = api.GetCacheItem(cacheKey, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -11940,7 +11979,7 @@ var Account;
                 }
             }));
             api.SetCacheItem({
-                key: GetCacheKey(id),
+                key: cacheKey,
                 value: prom,
                 req: reqParams
             });
@@ -11959,7 +11998,8 @@ var Account;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = api.GetCacheItem(GetCacheKey(subdomain), reqParams);
+            const cacheKey = GetCacheKey(api.GetSessionId(), subdomain);
+            const cache = api.GetCacheItem(cacheKey, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -11983,7 +12023,7 @@ var Account;
                 }
             }));
             api.SetCacheItem({
-                key: GetCacheKey(subdomain),
+                key: cacheKey,
                 value: prom,
                 req: reqParams
             });
@@ -12002,7 +12042,8 @@ var Account;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = api.GetCacheItem(GetListCacheKey(api.GetSessionId(), owned), reqParams);
+            const cacheKey = GetListCacheKey(api.GetSessionId(), userId, owned);
+            const cache = api.GetCacheItem(cacheKey, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -12028,7 +12069,7 @@ var Account;
                 }
             }));
             api.SetCacheItem({
-                key: GetListCacheKey(api.GetSessionId(), owned),
+                key: cacheKey,
                 value: prom,
                 req: reqParams
             });
@@ -12047,7 +12088,8 @@ var Account;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = api.GetCacheItem(GetCacheKey(id, appId), reqParams);
+            const cacheKey = GetCacheKey(api.GetSessionId(), id, appId);
+            const cache = api.GetCacheItem(cacheKey, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -12066,7 +12108,7 @@ var Account;
                 }
             }));
             api.SetCacheItem({
-                key: GetCacheKey(id, appId),
+                key: cacheKey,
                 value: prom,
                 req: reqParams
             });
@@ -12087,7 +12129,7 @@ var Account;
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
             const res = yield api.POST(`account/${id}/applicationSettings/${appId}?Override=${override ? "true" : "false"}`, data, reqParams);
-            api.Cache.RemoveByStartsWith(Api.ECacheKey.Account + Api.ECacheKey.Id + id);
+            api.Cache.RemoveByContains(Api.ECacheKey.Account + Api.ECacheKey.Id + id);
             return {
                 settings: res
             };
@@ -12120,7 +12162,7 @@ var Account;
             const resData = {
                 account: res
             };
-            api.Cache.RemoveByStartsWith(GetListCacheKey(api.GetSessionId()));
+            api.Cache.RemoveByContains(GetListCacheKey(api.GetSessionId()));
             return resData;
         });
     }
@@ -12153,15 +12195,19 @@ var Account;
      *    const key = GetCacheKey(1);
      *    api.Cache.Remove(key);
      * }
+     * @param sessionId
      * @param accountId
      * @param appSettingsId
      * @returns
      */
-    function GetCacheKey(accountId, appSettingsId) {
+    function GetCacheKey(sessionId, accountId, appSettingsId) {
+        if (!sessionId) {
+            sessionId = "anonymous";
+        }
         if (appSettingsId) {
-            return Api.ECacheKey.Account + Api.ECacheKey.Id + accountId + Api.ECacheKey + appSettingsId;
+            return Api.ECacheKey.Account + Api.ECacheKey.Id + accountId + Api.ECacheKey + appSettingsId + Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId;
         }
-        return Api.ECacheKey.Account + Api.ECacheKey.Id + accountId;
+        return Api.ECacheKey.Account + Api.ECacheKey.Id + accountId + Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId;
     }
     Account.GetCacheKey = GetCacheKey;
     /**
@@ -12174,11 +12220,17 @@ var Account;
      * @param ssid
      * @returns
      */
-    function GetListCacheKey(ssid, owned) {
+    function GetListCacheKey(ssid, userId, owned) {
         if (!owned) {
             owned = false;
         }
-        return Api.ECacheKey.Account + Api.ECacheKey.Session + Api.ECacheKey.Id + ssid + Api.ECacheKey.Id + (owned ? "owned" : "related");
+        if (!ssid) {
+            ssid = "anonymous";
+        }
+        if (!userId) {
+            userId = "anonymous";
+        }
+        return Api.ECacheKey.Account + Api.ECacheKey.Session + Api.ECacheKey.Id + ssid + Api.ECacheKey.Id + (owned ? "owned" : "related") + Api.ECacheKey.User + Api.ECacheKey.Id + userId;
     }
     Account.GetListCacheKey = GetListCacheKey;
     /**
@@ -12761,7 +12813,7 @@ var User;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cacheKey = GetCacheKey(id, accountId);
+            const cacheKey = GetCacheKey(api.GetSessionId(), id, accountId);
             const cache = api.GetCacheItem(cacheKey, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
@@ -12825,10 +12877,10 @@ var User;
             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);
+                api.Cache.RemoveByContains(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
             }
             else if (data.Type == EType.User) {
-                api.Cache.RemoveByStartsWith(Api.ECacheKey.User + Api.ECacheKey.Account);
+                api.Cache.RemoveByContains(Api.ECacheKey.User + Api.ECacheKey.Account);
             }
             return {
                 user: res
@@ -12859,7 +12911,7 @@ var User;
             }
             const res = yield api.POST("user", data, reqParams);
             api.Cache.RemoveByContains(Api.ECacheKey.User + Api.ECacheKey.Id + data.ID);
-            api.Cache.RemoveByStartsWith(Api.ECacheKey.User + Api.ECacheKey.Account);
+            api.Cache.RemoveByContains(Api.ECacheKey.User + Api.ECacheKey.Account);
             return {
                 user: res
             };
@@ -12880,7 +12932,8 @@ var User;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cache = api.GetCacheItem(GetSettingsCacheKey(userId, appId), req);
+            const cacheKey = GetSettingsCacheKey(api.GetSessionId(), userId, appId);
+            const cache = api.GetCacheItem(cacheKey, req);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -12907,7 +12960,7 @@ var User;
                 }
             }));
             api.SetCacheItem({
-                key: GetSettingsCacheKey(userId, appId),
+                key: cacheKey,
                 value: prom,
                 req: req
             });
@@ -12937,7 +12990,7 @@ var User;
                 UserID: userId
             };
             const prom = api.POST(`user/${userId}/application/${appId}/settings?Override=${override ? "true" : "false"}`, postBody, req);
-            api.Cache.Remove(GetSettingsCacheKey(userId, appId));
+            api.Cache.Remove(GetSettingsCacheKey(api.GetSessionId(), userId, appId));
             return prom;
         });
     }
@@ -12986,14 +13039,20 @@ var User;
          * @param search
          * @returns
          */
-        function GetListCacheKey(accountId, exclusive, search) {
+        function GetListCacheKey(sessionId, accountId, exclusive, search) {
             if (!exclusive) {
                 exclusive = false;
             }
             if (!search) {
                 search = "";
             }
-            return Api.ECacheKey.User + Api.ECacheKey.Account + Api.ECacheKey.Id + accountId + Api.ECacheKey.Id + exclusive + Api.ECacheKey.Id + search;
+            if (!sessionId) {
+                sessionId = "anonymous";
+            }
+            if (!accountId) {
+                accountId = "";
+            }
+            return Api.ECacheKey.User + Api.ECacheKey.Account + Api.ECacheKey.Id + accountId + Api.ECacheKey.Id + exclusive + Api.ECacheKey.Id + search + Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId;
         }
         LoginUser.GetListCacheKey = GetListCacheKey;
         /**
@@ -13010,7 +13069,8 @@ var User;
                 if (!api) {
                     api = ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cache = api.GetCacheItem(GetEmailCacheKey(email, accountId), reqParams);
+                const cacheKey = GetEmailCacheKey(api.GetSessionId(), email, accountId);
+                const cache = api.GetCacheItem(cacheKey, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -13026,7 +13086,7 @@ var User;
                     }
                 }));
                 api.SetCacheItem({
-                    key: GetEmailCacheKey(email, accountId),
+                    key: cacheKey,
                     value: prom,
                     req: reqParams
                 });
@@ -13048,7 +13108,8 @@ var User;
                 if (!exclusive) {
                     exclusive = false;
                 }
-                const cacheKey = GetListCacheKey(accountId, exclusive, search);
+                const sessionId = api.GetSessionId();
+                const cacheKey = GetListCacheKey(sessionId, accountId, exclusive, search);
                 const cache = exclusive ? null : api.GetCacheItem(cacheKey, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
@@ -13078,7 +13139,7 @@ var User;
                     const users = data.users;
                     for (let i = 0; i < users.length; i++) {
                         api.SetCacheItem({
-                            key: GetCacheKey(users[i].ID, accountId),
+                            key: GetCacheKey(sessionId, users[i].ID, accountId),
                             value: {
                                 user: users[i]
                             },
@@ -13236,11 +13297,18 @@ var User;
          *     const key = GetListCacheKey("abc");
          *     api.Cache.Remove(key);
          * }
+         * @param sessionId
          * @param accountId
          * @returns
          */
-        function GetListCacheKey(accountId) {
-            return Api.ECacheKey.AccessToken + Api.ECacheKey.Account + Api.ECacheKey.Id + accountId;
+        function GetListCacheKey(sessionId, accountId) {
+            if (!sessionId) {
+                sessionId = "anonymous";
+            }
+            if (!accountId) {
+                accountId = "";
+            }
+            return Api.ECacheKey.AccessToken + Api.ECacheKey.Account + Api.ECacheKey.Id + accountId + Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId;
         }
         AccessToken.GetListCacheKey = GetListCacheKey;
         /**
@@ -13254,7 +13322,8 @@ var User;
                 if (!api) {
                     api = ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cache = api.GetCacheItem(GetListCacheKey(accountId), reqParams);
+                const cacheKey = GetListCacheKey(api.GetSessionId(), accountId);
+                const cache = api.GetCacheItem(cacheKey, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -13270,7 +13339,7 @@ var User;
                     }
                 }));
                 api.SetCacheItem({
-                    key: GetListCacheKey(accountId),
+                    key: cacheKey,
                     value: req,
                     req: reqParams
                 });
@@ -13290,7 +13359,7 @@ var User;
                 }
                 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);
+                api.Cache.RemoveByContains(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
             });
         }
         AccessToken.Delete = Delete;
@@ -13315,7 +13384,7 @@ var User;
                     data.Type = EType.AccessToken;
                 }
                 data = yield api.POST("accessToken", data, reqParams);
-                api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
+                api.Cache.RemoveByContains(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
                 return {
                     user: data
                 };
@@ -13350,15 +13419,19 @@ var User;
      *     const key = GetCacheKey("abc", "def");
      *     api.Cache.Remove(key);
      * }
+     * @param sessionId
      * @param userId
      * @param accountId
      * @returns
      */
-    function GetCacheKey(userId, accountId) {
+    function GetCacheKey(sessionId, userId, accountId) {
         if (!accountId) {
             accountId = "";
         }
-        return Api.ECacheKey.User + Api.ECacheKey.Id + userId + Api.ECacheKey.Id + accountId;
+        if (!sessionId) {
+            sessionId = "anonymous";
+        }
+        return Api.ECacheKey.User + Api.ECacheKey.Id + userId + Api.ECacheKey.Id + accountId + Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId;
     }
     User$$1.GetCacheKey = GetCacheKey;
     /**
@@ -13372,11 +13445,17 @@ var User;
      * @param accountId
      * @returns
      */
-    function GetEmailCacheKey(email, accountId) {
+    function GetEmailCacheKey(sessionId, email, accountId) {
         if (!accountId) {
             accountId = "";
         }
-        return Api.ECacheKey.User + Api.ECacheKey.UserEmail + email + Api.ECacheKey.Id + accountId;
+        if (!sessionId) {
+            sessionId = "anonymous";
+        }
+        if (!email) {
+            email = "";
+        }
+        return Api.ECacheKey.User + Api.ECacheKey.UserEmail + email + Api.ECacheKey.Id + accountId + Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId;
     }
     User$$1.GetEmailCacheKey = GetEmailCacheKey;
     /**
@@ -13386,11 +13465,15 @@ var User;
      *     const key = GetCacheKey("abc", "def");
      *     api.Cache.Remove(key);
      * }
+     * @param sessionId
      * @param userId
      * @param appId
      * @returns
      */
-    function GetSettingsCacheKey(userId, appId) {
+    function GetSettingsCacheKey(sessionId, userId, appId) {
+        if (!sessionId) {
+            sessionId = "anonymous";
+        }
         return Api.ECacheKey.User + Api.ECacheKey.UserSettings + userId + Api.ECacheKey.Id + appId;
     }
     User$$1.GetSettingsCacheKey = GetSettingsCacheKey;
@@ -16064,7 +16147,7 @@ var Tracking;
 })(Tracking || (Tracking = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "6.4.8";
+const VERSION = "6.5.0";
 
 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, 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