@dra2020/baseclient 1.0.132 → 1.0.134

package/dist/detail/detail.d.ts

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

package/lib/detail/detail.ts

@@ -16,17 +16,34 @@ 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;
+  _error: boolean;
 
   constructor(expr: string)
   {
     this.expr = expr;
+    this._error = false;
   }
 
+  get error(): boolean { return this._error }
+
   eval(o: any): number
   {
+    this._error = false;
     try
     {
       // Convert property names to valid Javascript to ensure expression safety
@@ -49,7 +66,17 @@ class Evaluator
         });
 
       // 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
@@ -61,6 +88,7 @@ class Evaluator
     }
     catch (err)
     {
+      this._error = true;
       return 0;
     }
   }
@@ -83,13 +111,15 @@ const reExpr = /^=(.*)$/
 
 export class FormatDetail
 {
-  valid: boolean;
   pattern: string;
   items: DetailItem[];
+  _error: boolean;
+  options: DetailOptions;
 
-  constructor(pattern: string)
+  constructor(pattern: string, options?: DetailOptions)
   {
-    this.valid = true;
+    this.options = Util.shallowAssignImmutable(DefaultDetailOptions, options);
+    this._error = false;
     this.pattern = pattern.trim();
     let a = reExpr.exec(pattern);
     if (a && a.length == 2)
@@ -121,11 +151,13 @@ export class FormatDetail
     }
     else
     {
-      this.valid = false;
+      this._error = true;
       this.items = [ { text: 'invalid' } ];
     }
   }
 
+  get error(): boolean { return this._error }
+
   static prepare(o: any): any
   {
     if (o)
@@ -149,7 +181,11 @@ export class FormatDetail
 
   format(o: any): DetailResult
   {
-    if (!o) return { n: 0, v: '' };
+    if (!o)
+    {
+      this._error = true;
+      return { n: 0, v: '' };
+    }
     let n: number;
     let av = this.items.map(di => {
         if (di.text)
@@ -158,7 +194,9 @@ export class FormatDetail
         {
           let e = new Evaluator(di.expr);
           n = e.eval(o);
-          return Util.precisionRound(n, 0).toLocaleString();
+          if (! this._error)
+            this._error = e.error;
+          return this.options.numberFormat(n);
         }
       });
     return { n, v: av.join('') }

package/package.json

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