bruce-models 3.5.6 → 3.5.8

package/dist/bruce-models.umd.js

@@ -2947,14 +2947,14 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const reqs = [];
+                const crashRiskReqs = [];
                 const reqIds = [];
                 for (let i = 0; i < entityIds.length; i++) {
                     const entityId = entityIds[i];
                     const key = GetCacheKey({ entityId, expandRelations, expandLocation });
                     const cache = api.GetCacheItem(key, reqParams);
                     if (cache === null || cache === void 0 ? void 0 : cache.found) {
-                        reqs.push(cache.data);
+                        crashRiskReqs.push(cache.data);
                     }
                     else {
                         reqIds.push(entityId);
@@ -2974,6 +2974,7 @@
                 else if (expandLocation) {
                     reqData["Expand"] = "location";
                 }
+                const reqs = [];
                 if (reqIds.length > 0) {
                     const req = api.POST("entities", reqData, exports.Api.PrepReqParams(reqParams));
                     for (let i = 0; i < reqIds.length; i++) {
@@ -3000,8 +3001,22 @@
                         reqs.push(prom);
                     }
                 }
+                const entities = (yield Promise.all(reqs)).map(x => x === null || x === void 0 ? void 0 : x.entity).filter(x => !!x);
+                // We'll try/catch the crash-risk ones and append the results.
+                for (let i = 0; i < crashRiskReqs.length; i++) {
+                    const req = crashRiskReqs[i];
+                    try {
+                        const data = yield req;
+                        if (data === null || data === void 0 ? void 0 : data.entity) {
+                            entities.push(data.entity);
+                        }
+                    }
+                    catch (e) {
+                        // No showing error as we don't want to see it 2000 times.
+                    }
+                }
                 return {
-                    entities: (yield Promise.all(reqs)).map(x => x === null || x === void 0 ? void 0 : x.entity).filter(x => !!x)
+                    entities: entities
                 };
             });
         }
@@ -3948,9 +3963,14 @@
                         str: value,
                         entity: entity
                     });
-                    // Check if it includes a math operation.
+                    const isJsEval = typeof value == "string" && value.startsWith("JS:");
                     const MATH_REGEX = /(\d+\.?\d*|\.\d+)([+\-*/])(\d+\.?\d*|\.\d+)/;
-                    if (MATH_REGEX.test(value)) {
+                    const isMathEval = isJsEval || MATH_REGEX.test(value);
+                    if (isJsEval || isMathEval) {
+                        if (isJsEval) {
+                            value = value.replace("JS:", "");
+                            value = value.trim();
+                        }
                         // https://rollupjs.org/guide/en/#avoiding-eval
                         // This stops eval warning.
                         const eval2 = eval;
@@ -10619,7 +10639,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "3.5.6";
+    const VERSION = "3.5.8";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;