bruce-models 3.5.6 → 3.5.8

package/dist/bruce-models.es5.js

@@ -3000,14 +3000,14 @@ var Entity;
             if (!api) {
                 api = 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);
@@ -3027,6 +3027,7 @@ var Entity;
             else if (expandLocation) {
                 reqData["Expand"] = "location";
             }
+            const reqs = [];
             if (reqIds.length > 0) {
                 const req = api.POST("entities", reqData, Api.PrepReqParams(reqParams));
                 for (let i = 0; i < reqIds.length; i++) {
@@ -3053,8 +3054,22 @@ var Entity;
                     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
             };
         });
     }
@@ -4013,9 +4028,14 @@ var Calculator;
                     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;
@@ -10872,7 +10892,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "3.5.6";
+const VERSION = "3.5.8";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map