bruce-models 7.0.4 → 7.0.5

package/dist/bruce-models.es5.js

@@ -5293,92 +5293,96 @@ var Calculator;
             }
             for (let i = 0; i < value.values.length; i++) {
                 const option = value.values[i];
-                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;
-                }
-                if (isValueNum && (isMapValueNum || (typeof mapValue === "string" && mapValue.includes("-")))) {
-                    if (+mapValue == +eValue) {
-                        return option.appliedValue;
-                    }
-                    const mapSplit = mapValue.split("-");
-                    if (mapSplit.length == 2) {
-                        const min = mapSplit[0];
-                        const max = mapSplit[1];
-                        if (min != "") {
-                            if (+eValue < +min) {
-                                continue;
+                const fieldValues = Array.isArray(option.fieldValue) ? option.fieldValue : [option.fieldValue];
+                // Check each field value in the array.
+                for (let j = 0; j < fieldValues.length; j++) {
+                    let mapValue = fieldValues[j];
+                    // 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;
                             }
-                        }
-                        if (max != "") {
-                            if (+eValue > +max) {
+                            else {
                                 continue;
                             }
                         }
-                        if (min == "" && max == "") {
+                        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;
                         }
-                        return option.appliedValue;
                     }
-                }
-                else {
-                    if (mapValue == eValue) {
-                        return option.appliedValue;
+                    let isMapValueNum = !isNaN(+mapValue);
+                    if (isMapValueNum == null) {
+                        isMapValueNum = false;
                     }
-                    // Case where Entity value is a boolean but the mapping value is a string.
-                    // 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.toLowerCase() == eValueStr) {
+                    if (isValueNum && (isMapValueNum || (typeof mapValue === "string" && mapValue.includes("-")))) {
+                        if (+mapValue == +eValue) {
+                            return option.appliedValue;
+                        }
+                        const mapSplit = mapValue.split("-");
+                        if (mapSplit.length == 2) {
+                            const min = mapSplit[0];
+                            const max = mapSplit[1];
+                            if (min != "") {
+                                if (+eValue < +min) {
+                                    continue;
+                                }
+                            }
+                            if (max != "") {
+                                if (+eValue > +max) {
+                                    continue;
+                                }
+                            }
+                            if (min == "" && max == "") {
+                                continue;
+                            }
                             return option.appliedValue;
                         }
                     }
-                    // Handling possible case where the opposite is true.
-                    // 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.toLowerCase()) {
+                    else {
+                        if (mapValue == eValue) {
                             return option.appliedValue;
                         }
+                        // Case where Entity value is a boolean but the mapping value is a string.
+                        // 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.toLowerCase() == eValueStr) {
+                                return option.appliedValue;
+                            }
+                        }
+                        // Handling possible case where the opposite is true.
+                        // 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.toLowerCase()) {
+                                return option.appliedValue;
+                            }
+                        }
                     }
                 }
             }
@@ -17017,7 +17021,7 @@ class NavigatorMcpWebSocketClient {
 }
 
 // This is updated with the package.json version on build.
-const VERSION = "7.0.4";
+const VERSION = "7.0.5";
 
 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, NavigatorChatClient, NavigatorMcpWebSocketClient };
 //# sourceMappingURL=bruce-models.es5.js.map