@dra2020/baseclient 1.0.137 → 1.0.139

package/dist/baseclient.js

@@ -1246,10 +1246,18 @@ 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 };
+// Number format: (locale|general|integer|currency).precision
+function formatNumber(n, format) {
+    if (!format)
+        format = 'locale.0';
+    let parts = format.split('.');
+    let fmt = parts[0];
+    let precision = Number(parts[1] || '0');
+    n = Util.precisionRound(n, precision);
+    // Only have implementation for 'locale'
+    return n.toLocaleString();
+}
+const DefaultDetailOptions = { numberFormat: 'locale.0' };
 class Evaluator {
     constructor(expr) {
         this.expr = expr;
@@ -1366,7 +1374,7 @@ class FormatDetail {
                 n = e.eval(o);
                 if (!this._error)
                     this._error = e.error;
-                return this.options.numberFormat(n);
+                return formatNumber(n, this.options.numberFormat);
             }
         });
         return { n, v: av.join('') };
@@ -1523,6 +1531,11 @@ const UpperR = 82;
 function isWhite(c) {
     return c === Space || c === Newline || c === Tab || c == CR;
 }
+function toString(a) {
+    if (typeof a === 'object' && a && typeof a.value === 'string')
+        return a.value;
+    return String(a);
+}
 var TokType;
 (function (TokType) {
     TokType[TokType["Text"] = 0] = "Text";
@@ -1995,7 +2008,7 @@ class FilterExpr {
             case TokType.Text:
                 for (let p in o)
                     if (o.hasOwnProperty(p) && (prop == null || p.toLowerCase() === prop)) {
-                        let s = String(o[p]);
+                        let s = toString(o[p]);
                         if (s) {
                             let t = types ? types[p] : undefined;
                             if (t === 'skip')