@dra2020/baseclient 1.0.132 → 1.0.133

package/dist/baseclient.js

@@ -1206,8 +1206,11 @@ const reParam = /^__\d+$/;
 class Evaluator {
     constructor(expr) {
         this.expr = expr;
+        this._error = false;
     }
+    get error() { return this._error; }
     eval(o) {
+        this._error = false;
         try {
             // Convert property names to valid Javascript to ensure expression safety
             o = Util.shallowCopy(o);
@@ -1227,7 +1230,15 @@ class Evaluator {
                     safeexpr = safeexpr.replace(n, namemap[n]);
             });
             // Remove any identifiers that aren't the simple parameters to prevent out-of-sandbox execution
-            safeexpr = safeexpr.replace(reIdentifier, (match) => { return reParam.test(match) ? match : "invalid"; });
+            safeexpr = safeexpr.replace(reIdentifier, (match) => {
+                let valid = reParam.test(match);
+                if (valid)
+                    return match;
+                else {
+                    this._error = true;
+                    return 'invalid';
+                }
+            });
             // Create a new function that accepts the variables as parameters
             // and evaluates the expression
             const func = new Function(...safenames, `return ${safeexpr};`);
@@ -1236,6 +1247,7 @@ class Evaluator {
             return isNaN(r) ? 0 : r;
         }
         catch (err) {
+            this._error = true;
             return 0;
         }
     }
@@ -1244,7 +1256,7 @@ const reInvalidChars = /[\.\[\]\\]/;
 const reExpr = /^=(.*)$/;
 class FormatDetail {
     constructor(pattern) {
-        this.valid = true;
+        this._error = false;
         this.pattern = pattern.trim();
         let a = reExpr.exec(pattern);
         if (a && a.length == 2) {
@@ -1272,10 +1284,11 @@ class FormatDetail {
             });
         }
         else {
-            this.valid = false;
+            this._error = true;
             this.items = [{ text: 'invalid' }];
         }
     }
+    get error() { return this._error; }
     static prepare(o) {
         if (o) {
             // Make sure there is a total field
@@ -1294,8 +1307,10 @@ class FormatDetail {
         return o;
     }
     format(o) {
-        if (!o)
+        if (!o) {
+            this._error = true;
             return { n: 0, v: '' };
+        }
         let n;
         let av = this.items.map(di => {
             if (di.text)
@@ -1303,6 +1318,8 @@ class FormatDetail {
             else {
                 let e = new Evaluator(di.expr);
                 n = e.eval(o);
+                if (!this._error)
+                    this._error = e.error;
                 return Util.precisionRound(n, 0).toLocaleString();
             }
         });