bruce-models 6.4.8 → 6.5.0

package/dist/bruce-models.umd.js

@@ -4991,7 +4991,45 @@
                 }
                 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 = exports.PathUtils.Wrap(attrPath);
+                            jsEval = jsEval.replace("${}", "${" + attrPathStr + "}");
+                            jsEval = exports.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;
@@ -5028,7 +5066,7 @@
                         // 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;
                             }
                         }
@@ -5036,7 +5074,7 @@
                         // 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;
                             }
                         }
@@ -11690,7 +11728,8 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -11714,7 +11753,7 @@
                     }
                 }));
                 api.SetCacheItem({
-                    key: GetCacheKey(id),
+                    key: cacheKey,
                     value: prom,
                     req: reqParams
                 });
@@ -11733,7 +11772,8 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -11757,7 +11797,7 @@
                     }
                 }));
                 api.SetCacheItem({
-                    key: GetCacheKey(subdomain),
+                    key: cacheKey,
                     value: prom,
                     req: reqParams
                 });
@@ -11776,7 +11816,8 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -11802,7 +11843,7 @@
                     }
                 }));
                 api.SetCacheItem({
-                    key: GetListCacheKey(api.GetSessionId(), owned),
+                    key: cacheKey,
                     value: prom,
                     req: reqParams
                 });
@@ -11821,7 +11862,8 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -11840,7 +11882,7 @@
                     }
                 }));
                 api.SetCacheItem({
-                    key: GetCacheKey(id, appId),
+                    key: cacheKey,
                     value: prom,
                     req: reqParams
                 });
@@ -11861,7 +11903,7 @@
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
                 const res = yield api.POST(`account/${id}/applicationSettings/${appId}?Override=${override ? "true" : "false"}`, data, reqParams);
-                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + id);
+                api.Cache.RemoveByContains(exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + id);
                 return {
                     settings: res
                 };
@@ -11894,7 +11936,7 @@
                 const resData = {
                     account: res
                 };
-                api.Cache.RemoveByStartsWith(GetListCacheKey(api.GetSessionId()));
+                api.Cache.RemoveByContains(GetListCacheKey(api.GetSessionId()));
                 return resData;
             });
         }
@@ -11927,15 +11969,19 @@
          *    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 exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey + appSettingsId;
+                return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey + appSettingsId + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + sessionId;
             }
-            return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId;
+            return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + sessionId;
         }
         Account.GetCacheKey = GetCacheKey;
         /**
@@ -11948,11 +11994,17 @@
          * @param ssid
          * @returns
          */
-        function GetListCacheKey(ssid, owned) {
+        function GetListCacheKey(ssid, userId, owned) {
             if (!owned) {
                 owned = false;
             }
-            return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + ssid + exports.Api.ECacheKey.Id + (owned ? "owned" : "related");
+            if (!ssid) {
+                ssid = "anonymous";
+            }
+            if (!userId) {
+                userId = "anonymous";
+            }
+            return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + ssid + exports.Api.ECacheKey.Id + (owned ? "owned" : "related") + exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + userId;
         }
         Account.GetListCacheKey = GetListCacheKey;
         /**
@@ -12515,7 +12567,7 @@
                 if (!api) {
                     api = exports.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;
@@ -12579,10 +12631,10 @@
                 const res = yield api.POST(`user/${data.ID}`, data, reqParams);
                 api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + data.ID);
                 if (data.Type == EType.AccessToken) {
-                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByContains(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                 }
                 else if (data.Type == EType.User) {
-                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account);
                 }
                 return {
                     user: res
@@ -12613,7 +12665,7 @@
                 }
                 const res = yield api.POST("user", data, reqParams);
                 api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + data.ID);
-                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account);
+                api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account);
                 return {
                     user: res
                 };
@@ -12634,7 +12686,8 @@
                 if (!api) {
                     api = exports.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;
                 }
@@ -12661,7 +12714,7 @@
                     }
                 }));
                 api.SetCacheItem({
-                    key: GetSettingsCacheKey(userId, appId),
+                    key: cacheKey,
                     value: prom,
                     req: req
                 });
@@ -12691,7 +12744,7 @@
                     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;
             });
         }
@@ -12740,14 +12793,20 @@
              * @param search
              * @returns
              */
-            function GetListCacheKey(accountId, exclusive, search) {
+            function GetListCacheKey(sessionId, accountId, exclusive, search) {
                 if (!exclusive) {
                     exclusive = false;
                 }
                 if (!search) {
                     search = "";
                 }
-                return exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey.Id + exclusive + exports.Api.ECacheKey.Id + search;
+                if (!sessionId) {
+                    sessionId = "anonymous";
+                }
+                if (!accountId) {
+                    accountId = "";
+                }
+                return exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey.Id + exclusive + exports.Api.ECacheKey.Id + search + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + sessionId;
             }
             LoginUser.GetListCacheKey = GetListCacheKey;
             /**
@@ -12764,7 +12823,8 @@
                     if (!api) {
                         api = exports.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;
                     }
@@ -12780,7 +12840,7 @@
                         }
                     }));
                     api.SetCacheItem({
-                        key: GetEmailCacheKey(email, accountId),
+                        key: cacheKey,
                         value: prom,
                         req: reqParams
                     });
@@ -12802,7 +12862,8 @@
                     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;
@@ -12832,7 +12893,7 @@
                         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]
                                 },
@@ -12990,11 +13051,18 @@
              *     const key = GetListCacheKey("abc");
              *     api.Cache.Remove(key);
              * }
+             * @param sessionId
              * @param accountId
              * @returns
              */
-            function GetListCacheKey(accountId) {
-                return exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId;
+            function GetListCacheKey(sessionId, accountId) {
+                if (!sessionId) {
+                    sessionId = "anonymous";
+                }
+                if (!accountId) {
+                    accountId = "";
+                }
+                return exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + sessionId;
             }
             AccessToken.GetListCacheKey = GetListCacheKey;
             /**
@@ -13008,7 +13076,8 @@
                     if (!api) {
                         api = exports.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;
                     }
@@ -13024,7 +13093,7 @@
                         }
                     }));
                     api.SetCacheItem({
-                        key: GetListCacheKey(accountId),
+                        key: cacheKey,
                         value: req,
                         req: reqParams
                     });
@@ -13044,7 +13113,7 @@
                     }
                     yield api.DELETE(`accessToken/${id}`, reqParams);
                     api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + id);
-                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByContains(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                 });
             }
             AccessToken.Delete = Delete;
@@ -13069,7 +13138,7 @@
                         data.Type = EType.AccessToken;
                     }
                     data = yield api.POST("accessToken", data, reqParams);
-                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByContains(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                     return {
                         user: data
                     };
@@ -13104,15 +13173,19 @@
          *     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 exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + userId + exports.Api.ECacheKey.Id + accountId;
+            if (!sessionId) {
+                sessionId = "anonymous";
+            }
+            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + userId + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + sessionId;
         }
         User.GetCacheKey = GetCacheKey;
         /**
@@ -13126,11 +13199,17 @@
          * @param accountId
          * @returns
          */
-        function GetEmailCacheKey(email, accountId) {
+        function GetEmailCacheKey(sessionId, email, accountId) {
             if (!accountId) {
                 accountId = "";
             }
-            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserEmail + email + exports.Api.ECacheKey.Id + accountId;
+            if (!sessionId) {
+                sessionId = "anonymous";
+            }
+            if (!email) {
+                email = "";
+            }
+            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserEmail + email + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + sessionId;
         }
         User.GetEmailCacheKey = GetEmailCacheKey;
         /**
@@ -13140,11 +13219,15 @@
          *     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 exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserSettings + userId + exports.Api.ECacheKey.Id + appId;
         }
         User.GetSettingsCacheKey = GetSettingsCacheKey;
@@ -15750,7 +15833,7 @@
     })(exports.Tracking || (exports.Tracking = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "6.4.8";
+    const VERSION = "6.5.0";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;