@dra2020/baseclient 1.0.165 → 1.0.167

package/dist/all/all.d.ts

@@ -14,8 +14,8 @@ import * as OT from '../ot-js/all';
 export { OT };
 import * as OTE from '../ot-editutil/all';
 export { OTE };
-import { FilterExpr } from '../filterexpr/all';
-export { FilterExpr };
+import { FilterExpr, cacheFilterExpr } from '../filterexpr/all';
+export { FilterExpr, cacheFilterExpr };
 import * as G from '../geo/all';
 export { G };
 import * as Emit from '../emit/all';

package/dist/baseclient.js

@@ -53,7 +53,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Control = 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;
+exports.Control = exports.Detail = exports.DataFlow = exports.Colors = exports.CSV = exports.Emit = exports.G = exports.cacheFilterExpr = 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;
@@ -73,6 +73,7 @@ const OTE = __importStar(__webpack_require__(/*! ../ot-editutil/all */ "./lib/ot
 exports.OTE = OTE;
 const all_1 = __webpack_require__(/*! ../filterexpr/all */ "./lib/filterexpr/all.ts");
 Object.defineProperty(exports, "FilterExpr", ({ enumerable: true, get: function () { return all_1.FilterExpr; } }));
+Object.defineProperty(exports, "cacheFilterExpr", ({ enumerable: true, get: function () { return all_1.cacheFilterExpr; } }));
 const G = __importStar(__webpack_require__(/*! ../geo/all */ "./lib/geo/all.ts"));
 exports.G = G;
 const Emit = __importStar(__webpack_require__(/*! ../emit/all */ "./lib/emit/all.ts"));
@@ -1502,6 +1503,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.FilterExpr = void 0;
+exports.cacheFilterExpr = cacheFilterExpr;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const Space = 32;
 const Tab = 9;
@@ -2035,38 +2037,48 @@ class FilterExpr {
         return a.join(' ');
     }
     testClause(o, types, clause, prop, relation) {
+        const filterProp = (p) => {
+            let s = toString(o[p]);
+            if (s) {
+                let t = types ? types[p] : undefined;
+                if (t === 'skip')
+                    return false;
+                if (t && t === 'date')
+                    s = wordyDate(s);
+                s = s.toLowerCase();
+                if (relation === undefined) {
+                    if (s.indexOf(clause.op.text) >= 0)
+                        return true;
+                }
+                else {
+                    let op2 = isNaN(Number(clause.op.text)) ? clause.op.text : Number(clause.op.text);
+                    let op1 = typeof op2 === 'number' ? Number(s) : s;
+                    switch (relation) {
+                        case TokType.Equal: return op1 === op2;
+                        case TokType.LessThan: return op1 < op2;
+                        case TokType.LessThanEqual: return op1 <= op2;
+                        case TokType.GreaterThanEqual: return op1 >= op2;
+                        case TokType.GreaterThan: return op1 > op2;
+                        case TokType.NotEqual: return op1 !== op2;
+                    }
+                }
+            }
+        };
         if (clause == null)
             return true;
         switch (clause.op.tt) {
             case TokType.Text:
-                for (let p in o)
-                    if (o.hasOwnProperty(p) && (prop == null || p.toLowerCase() === prop)) {
-                        let s = toString(o[p]);
-                        if (s) {
-                            let t = types ? types[p] : undefined;
-                            if (t === 'skip')
-                                continue;
-                            if (t && t === 'date')
-                                s = wordyDate(s);
-                            s = s.toLowerCase();
-                            if (relation === undefined) {
-                                if (s.indexOf(clause.op.text) >= 0)
-                                    return true;
-                            }
-                            else {
-                                let op2 = isNaN(Number(clause.op.text)) ? clause.op.text : Number(clause.op.text);
-                                let op1 = typeof op2 === 'number' ? Number(s) : s;
-                                switch (relation) {
-                                    case TokType.Equal: return op1 === op2;
-                                    case TokType.LessThan: return op1 < op2;
-                                    case TokType.LessThanEqual: return op1 <= op2;
-                                    case TokType.GreaterThanEqual: return op1 >= op2;
-                                    case TokType.GreaterThan: return op1 > op2;
-                                    case TokType.NotEqual: return op1 !== op2;
-                                }
-                            }
-                        }
-                    }
+                if (o._filtercache) {
+                    if (prop == null)
+                        return o._filtercache.indexOf(clause.op.text) >= 0;
+                    else
+                        return filterProp(prop);
+                }
+                else {
+                    for (let p in o)
+                        if ((prop == null || p === prop) && filterProp(p))
+                            return true;
+                }
                 return false;
             case TokType.Colon:
                 if (clause.operand1 && clause.operand1.op.tt === TokType.Text)
@@ -2092,6 +2104,26 @@ class FilterExpr {
     }
 }
 exports.FilterExpr = FilterExpr;
+function cacheFilterExpr(o, types) {
+    if (o) {
+        delete o._filtercache;
+        let a = [];
+        for (let p in o) {
+            let s;
+            let t = types ? types[p] : undefined;
+            if (t === 'skip')
+                s = '';
+            else {
+                s = toString(o[p]);
+                if (t === 'date')
+                    s = wordyDate(s);
+                s = s.toLowerCase();
+            }
+            a.push(s);
+        }
+        o._filtercache = a.join('|'); // insert separator to reduce likelihood of spurious matches that cross property values
+    }
+}
 
 
 /***/ }),
@@ -5274,11 +5306,10 @@ class OTClientEngine extends OTE.OTEngine {
         this.clientID = cid;
         this.initialize();
         this.bReadOnly = false;
-        this.valCache = {};
     }
     initialize() {
         if (this.prefailCache === undefined && this.clientSequenceNo > 0)
-            this.prefailCache = this.valCache;
+            this.prefailCache = this.toValue();
         this.clientSequenceNo = 0;
         this.isNeedAck = false;
         this.isNeedResend = false;
@@ -5301,9 +5332,13 @@ class OTClientEngine extends OTE.OTEngine {
         return this.resourceID;
     }
     toPartialValue(resourceName) {
+        if (!this.valCache)
+            this.valCache = {};
         return this.valCache[resourceName];
     }
     toValue() {
+        if (!this.valCache)
+            this.valCache = this.stateLocal.toValue();
         return this.valCache;
     }
     toPrefailValue() {
@@ -5363,14 +5398,14 @@ class OTClientEngine extends OTE.OTEngine {
     failbackToInitialState() {
         console.log('otclientengine: failbackToInitialState');
         if (this.prefailCache === undefined)
-            this.prefailCache = this.valCache;
+            this.prefailCache = this.toValue();
         this.initialize();
     }
     // When I have server state but my state got mixed up
     failbackToServerState() {
         console.log('otclientengine: failbackToServerState');
         if (this.prefailCache === undefined)
-            this.prefailCache = this.valCache;
+            this.prefailCache = this.toValue();
         this.stateLocal = this.stateServer.copy();
         this.isNeedAck = false;
         this.actionSentClient.empty();
@@ -5378,7 +5413,7 @@ class OTClientEngine extends OTE.OTEngine {
         this.actionServerInterposedSentClient.empty();
         this.actionAllPendingClient.empty();
         this.actionAllClient.empty();
-        this.valCache = this.stateLocal.toValue();
+        delete this.valCache;
         this.emit('state');
     }
     //
@@ -5464,7 +5499,7 @@ class OTClientEngine extends OTE.OTEngine {
                 if (this.isNeedAck)
                     this.actionServerInterposedSentClient.compose(orig);
                 // Let clients know
-                this.valCache = this.stateLocal.toValue();
+                delete this.valCache;
                 this.emit('state');
             }
         }
@@ -5494,7 +5529,7 @@ class OTClientEngine extends OTE.OTEngine {
                 this.actionAllClient.compose(orig);
                 this.actionAllPendingClient.compose(orig);
                 this.stateLocal.compose(orig);
-                this.valCache = this.stateLocal.toValue();
+                delete this.valCache;
                 this.emit('state');
             }
             catch (err) {