@dra2020/baseclient 1.0.137 → 1.0.139

package/dist/detail/detail.d.ts

@@ -1,5 +1,5 @@
 export interface DetailOptions {
-    numberFormat?: (n: number) => string;
+    numberFormat?: string;
 }
 interface DetailItem {
     expr?: string;

package/lib/detail/detail.ts

@@ -16,17 +16,25 @@ import * as Util from '../util/all';
 const reIdentifier = /\b[a-zA-Z_$][a-zA-Z0-9_$]*\b/g;
 const reParam = /^__\d+$/
 
-function defaultNumberFormat(n: number): string
+// Number format: (locale|general|integer|currency).precision
+
+function formatNumber(n: number, format: string): string
 {
-  return Util.precisionRound(n, 0).toLocaleString();
+  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();
 }
 
 export interface DetailOptions
 {
-  numberFormat?: (n: number) => string,
+  numberFormat?: string,
 }
 
-const DefaultDetailOptions: DetailOptions = { numberFormat: defaultNumberFormat };
+const DefaultDetailOptions: DetailOptions = { numberFormat: 'locale.0' };
 
 class Evaluator
 {
@@ -194,7 +202,7 @@ export 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('') }

package/lib/filterexpr/filterexpr.ts

@@ -32,6 +32,13 @@ function isWhite(c: number): boolean
   return c === Space || c === Newline || c === Tab || c == CR;
 }
 
+function toString(a: any): string
+{
+  if (typeof a === 'object' && a && typeof a.value === 'string')
+    return a.value;
+  return String(a);
+}
+
 enum TokType
 {
   Text,
@@ -637,7 +644,7 @@ export 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.137",
+  "version": "1.0.139",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",