@dra2020/baseclient 1.0.133 → 1.0.135

package/dist/detail/detail.d.ts

@@ -1,3 +1,6 @@
+export interface DetailOptions {
+    numberFormat?: (n: number) => string;
+}
 interface DetailItem {
     expr?: string;
     text?: string;
@@ -10,7 +13,8 @@ export declare class FormatDetail {
     pattern: string;
     items: DetailItem[];
     _error: boolean;
-    constructor(pattern: string);
+    options: DetailOptions;
+    constructor(pattern: string, options?: DetailOptions);
     get error(): boolean;
     static prepare(o: any): any;
     format(o: any): DetailResult;

package/dist/util/util.d.ts

@@ -69,3 +69,6 @@ export declare function distance(x0: number, y0: number, x1: number, y1: number)
 export declare function deg2rad(num: number): number;
 export declare function rad2deg(num: number): number;
 export declare function wrapLon(lon: number): number;
+export declare function isNumber(s: string): boolean;
+export declare function toNumber(a: any): number;
+export declare function toSafeNumber(a: any): number;

package/lib/detail/detail.ts

@@ -6,7 +6,7 @@
 // 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")
 //
@@ -16,6 +16,18 @@ 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
+{
+  return Util.precisionRound(n, 0).toLocaleString();
+}
+
+export interface DetailOptions
+{
+  numberFormat?: (n: number) => string,
+}
+
+const DefaultDetailOptions: DetailOptions = { numberFormat: defaultNumberFormat };
+
 class Evaluator
 {
   expr: string;
@@ -102,9 +114,11 @@ export class FormatDetail
   pattern: string;
   items: DetailItem[];
   _error: boolean;
+  options: DetailOptions;
 
-  constructor(pattern: string)
+  constructor(pattern: string, options?: DetailOptions)
   {
+    this.options = Util.shallowAssignImmutable(DefaultDetailOptions, options);
     this._error = false;
     this.pattern = pattern.trim();
     let a = reExpr.exec(pattern);
@@ -146,21 +160,19 @@ export class FormatDetail
 
   static prepare(o: any): any
   {
-    if (o)
+    if (o && o.Tot === undefined && o.Total === undefined)
     {
-      // Make sure there is a total field
+      // Add a total field
+      let t = 0;
+      Object.keys(o).forEach((k: string) => {
+          let v: any = 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: any) => {
-            if (!isNaN(v) && typeof v === 'number')
-              t += v;
-          });
-        o['_tot'] = t;
-      }
+      o.Tot = t;
+      o.Total = t;
     }
     return o;
   }
@@ -182,7 +194,7 @@ export 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('') }

package/lib/util/util.ts

@@ -708,3 +708,17 @@ export function wrapLon(lon: number): number
   let worlds = Math.floor((lon + 180) / 360);
   return lon - (worlds * 360);
 }
+
+let reNumber = /^\s*-?\d+(\.\d+)?([eE][+-]?\d+)?\s*$/;
+export function isNumber(s: string): boolean { return !!s && reNumber.test(s) }
+export function toNumber(a: any): number
+{
+  if (typeof a === 'number') return a;
+  if (typeof a === 'string' && !isNumber(a as string)) return NaN;
+  return Number(a);
+}
+export function toSafeNumber(a: any): number
+{
+  let n = toNumber(a);
+  if (isNaN(n) || typeof n !== 'number') return 0;
+}

package/package.json

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