@dra2020/baseclient 1.0.129 → 1.0.131

package/dist/all/all.d.ts

@@ -26,3 +26,5 @@ import * as Colors from '../colors/colors';
 export { Colors };
 import * as DataFlow from '../dataflow/all';
 export { DataFlow };
+import * as Detail from '../detail/all';
+export { Detail };

package/dist/baseclient.js

@@ -39,7 +39,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DataFlow = exports.Colors = exports.CSV = exports.Emit = exports.G = exports.FilterExpr = exports.OTE = exports.OT = exports.LogClient = exports.LogAbstract = exports.Poly = exports.FSM = exports.Context = exports.Util = void 0;
+exports.Detail = exports.DataFlow = exports.Colors = exports.CSV = exports.Emit = exports.G = exports.FilterExpr = exports.OTE = exports.OT = exports.LogClient = exports.LogAbstract = exports.Poly = exports.FSM = exports.Context = exports.Util = void 0;
 // Client and Server
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 exports.Util = Util;
@@ -69,6 +69,8 @@ const Colors = __importStar(__webpack_require__(/*! ../colors/colors */ "./lib/c
 exports.Colors = Colors;
 const DataFlow = __importStar(__webpack_require__(/*! ../dataflow/all */ "./lib/dataflow/all.ts"));
 exports.DataFlow = DataFlow;
+const Detail = __importStar(__webpack_require__(/*! ../detail/all */ "./lib/detail/all.ts"));
+exports.Detail = Detail;
 
 
 /***/ }),
@@ -1133,6 +1135,183 @@ class DataFlowStamp extends DataFlow {
 exports.DataFlowStamp = DataFlowStamp;
 
 
+/***/ }),
+
+/***/ "./lib/detail/all.ts":
+/*!***************************!*\
+  !*** ./lib/detail/all.ts ***!
+  \***************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./detail */ "./lib/detail/detail.ts"), exports);
+
+
+/***/ }),
+
+/***/ "./lib/detail/detail.ts":
+/*!******************************!*\
+  !*** ./lib/detail/detail.ts ***!
+  \******************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+//
+// FormatDetail will take an expression that specifies a format detail lines.
+// Given an object with a set of integer properties, it will evaluate the expression and produce
+// a result { k: string, n: number, v: string } results for displaying the contents of the object.
+//
+// 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
+// total of all properties. The expression may also include double-quoted strings that are
+// passed through (e.g. for use as labels = area" sqm")
+//
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+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+$/;
+class Evaluator {
+    constructor(expr) {
+        this.expr = expr;
+    }
+    eval(o) {
+        try {
+            // Convert property names to valid Javascript to ensure expression safety
+            o = Util.shallowCopy(o);
+            let namemap = {};
+            Object.keys(o).forEach((n, i) => {
+                namemap[n] = `__${i}`;
+            });
+            // Extract variable names and values from the object
+            let names = Object.keys(o);
+            let values = Object.values(o);
+            let safeexpr = this.expr;
+            let safenames = names.map(n => namemap[n]);
+            // replace longest field names first in case they contain substrings of short field names
+            names.sort((n1, n2) => n2.length - n1.length);
+            names.forEach((n, i) => {
+                while (safeexpr.indexOf(n) >= 0)
+                    safeexpr = safeexpr.replace(n, namemap[n]);
+            });
+            // 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"; });
+            // Create a new function that accepts the variables as parameters
+            // and evaluates the expression
+            const func = new Function(...safenames, `return ${safeexpr};`);
+            // Call the function with the variable values
+            let r = func(...values);
+            return isNaN(r) ? 0 : r;
+        }
+        catch (err) {
+            return 0;
+        }
+    }
+}
+const reInvalidChars = /[\.\[\]\\]/;
+const reExpr = /^=(.*)$/;
+class FormatDetail {
+    constructor(pattern) {
+        this.valid = true;
+        this.pattern = pattern.trim();
+        let a = reExpr.exec(pattern);
+        if (a && a.length == 2) {
+            this.items = [];
+            const expr = a[1];
+            const parse = expr.split('"');
+            let state = 'expr';
+            parse.forEach(subexpr => {
+                if (state === 'expr') {
+                    if (subexpr.length) {
+                        // Don't allow unsafe actions
+                        if (reInvalidChars.test(subexpr))
+                            this.items.push({ text: subexpr });
+                        else
+                            this.items.push({ expr: subexpr });
+                    }
+                    state = 'text';
+                }
+                else // state === 'text'
+                 {
+                    if (subexpr.length)
+                        this.items.push({ text: subexpr });
+                    state = 'expr';
+                }
+            });
+        }
+        else {
+            this.valid = false;
+            this.items = [{ text: 'invalid' }];
+        }
+    }
+    prepare(o) {
+        if (o) {
+            // Make sure there is a total field
+            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;
+            }
+        }
+        return o;
+    }
+    format(o) {
+        if (!o)
+            return { n: 0, v: '' };
+        let n;
+        let av = this.items.map(di => {
+            if (di.text)
+                return di.text;
+            else {
+                let e = new Evaluator(di.expr);
+                n = e.eval(o);
+                return Util.precisionRound(n, 0).toLocaleString();
+            }
+        });
+        return { n, v: av.join('') };
+    }
+}
+exports.FormatDetail = FormatDetail;
+
+
 /***/ }),
 
 /***/ "./lib/emit/all.ts":