@dra2020/baseclient 1.0.133 → 1.0.135

package/dist/baseclient.js

@@ -1175,7 +1175,7 @@ __exportStar(__webpack_require__(/*! ./detail */ "./lib/detail/detail.ts"), expo
 // The formatting string is a statement of the form:
 //    =expr
 // Expr can be an arithmetic expression using +-/*()?: as operators and variables are the field
-// names of properties on the object passed in. The special field name _tot represents the
+// names of properties on the object passed in. The special field name Tot represents the
 // total of all properties. The expression may also include double-quoted strings that are
 // passed through (e.g. for use as labels = area" sqm")
 //
@@ -1203,6 +1203,10 @@ exports.FormatDetail = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const reIdentifier = /\b[a-zA-Z_$][a-zA-Z0-9_$]*\b/g;
 const reParam = /^__\d+$/;
+function defaultNumberFormat(n) {
+    return Util.precisionRound(n, 0).toLocaleString();
+}
+const DefaultDetailOptions = { numberFormat: defaultNumberFormat };
 class Evaluator {
     constructor(expr) {
         this.expr = expr;
@@ -1255,7 +1259,8 @@ class Evaluator {
 const reInvalidChars = /[\.\[\]\\]/;
 const reExpr = /^=(.*)$/;
 class FormatDetail {
-    constructor(pattern) {
+    constructor(pattern, options) {
+        this.options = Util.shallowAssignImmutable(DefaultDetailOptions, options);
         this._error = false;
         this.pattern = pattern.trim();
         let a = reExpr.exec(pattern);
@@ -1290,19 +1295,17 @@ class FormatDetail {
     }
     get error() { return this._error; }
     static prepare(o) {
-        if (o) {
-            // Make sure there is a total field
+        if (o && o.Tot === undefined && o.Total === undefined) {
+            // Add a total field
+            let t = 0;
+            Object.keys(o).forEach((k) => {
+                let v = o[k];
+                if (!isNaN(v) && typeof v === 'number')
+                    t += v;
+            });
             o = Util.deepCopy(o);
-            if (o['Tot'] !== undefined)
-                o['_tot'] = o['Tot'];
-            else {
-                let t = 0;
-                Object.values(o).forEach((v) => {
-                    if (!isNaN(v) && typeof v === 'number')
-                        t += v;
-                });
-                o['_tot'] = t;
-            }
+            o.Tot = t;
+            o.Total = t;
         }
         return o;
     }
@@ -1320,7 +1323,7 @@ class FormatDetail {
                 n = e.eval(o);
                 if (!this._error)
                     this._error = e.error;
-                return Util.precisionRound(n, 0).toLocaleString();
+                return this.options.numberFormat(n);
             }
         });
         return { n, v: av.join('') };
@@ -11677,7 +11680,7 @@ exports.IndexedArray = IndexedArray;
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.wrapLon = exports.rad2deg = exports.deg2rad = exports.distance = exports.toRGBAIntensity = exports.toRGBA = exports.toHex = exports.hashObject = exports.hash = exports.percentString = exports.precisionRound = exports.deepAccum = exports.deepCopy = exports.shallowEqual = exports.shallowAssignImmutable = exports.shallowDelete = exports.shallowAssign = exports.shallowCopy = exports.textToHtml = exports.recentDate = exports.relativeDate = exports.prettyDate = exports.deepEqual = exports.partialEqual = exports.nthKey = exports.nthProperty = exports.countKeys = exports.isEmpty = exports.depthof = exports.sizeof = exports.guidKey = exports.createKeyedGuid = exports.createGuid = exports.Deadline = exports.MultiTimer = exports.Elapsed = exports.Now = void 0;
+exports.toSafeNumber = exports.toNumber = exports.isNumber = exports.wrapLon = exports.rad2deg = exports.deg2rad = exports.distance = exports.toRGBAIntensity = exports.toRGBA = exports.toHex = exports.hashObject = exports.hash = exports.percentString = exports.precisionRound = exports.deepAccum = exports.deepCopy = exports.shallowEqual = exports.shallowAssignImmutable = exports.shallowDelete = exports.shallowAssign = exports.shallowCopy = exports.textToHtml = exports.recentDate = exports.relativeDate = exports.prettyDate = exports.deepEqual = exports.partialEqual = exports.nthKey = exports.nthProperty = exports.countKeys = exports.isEmpty = exports.depthof = exports.sizeof = exports.guidKey = exports.createKeyedGuid = exports.createGuid = exports.Deadline = exports.MultiTimer = exports.Elapsed = exports.Now = void 0;
 function Now() { return (new Date()).toJSON(); }
 exports.Now = Now;
 // polyfill
@@ -12296,6 +12299,23 @@ function wrapLon(lon) {
     return lon - (worlds * 360);
 }
 exports.wrapLon = wrapLon;
+let reNumber = /^\s*-?\d+(\.\d+)?([eE][+-]?\d+)?\s*$/;
+function isNumber(s) { return !!s && reNumber.test(s); }
+exports.isNumber = isNumber;
+function toNumber(a) {
+    if (typeof a === 'number')
+        return a;
+    if (typeof a === 'string' && !isNumber(a))
+        return NaN;
+    return Number(a);
+}
+exports.toNumber = toNumber;
+function toSafeNumber(a) {
+    let n = toNumber(a);
+    if (isNaN(n) || typeof n !== 'number')
+        return 0;
+}
+exports.toSafeNumber = toSafeNumber;
 
 
 /***/ }),