@dra2020/baseclient 1.0.165 → 1.0.167

package/dist/filterexpr/filterexpr.d.ts

@@ -65,4 +65,5 @@ export declare class FilterExpr {
     asStringClause(clause: Clause): string;
     testClause(o: any, types: any, clause: Clause, prop?: string, relation?: TokType): boolean;
 }
+export declare function cacheFilterExpr(o: any, types: any): void;
 export {};

package/lib/all/all.ts

@@ -15,8 +15,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/lib/filterexpr/filterexpr.ts

@@ -677,42 +677,55 @@ export class FilterExpr
 
   testClause(o: any, types: any, clause: Clause, prop?: string, relation?: TokType): boolean
   {
-    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))
+    const filterProp = (p: string) => {
+        let s = toString(o[p]);
+        if (s)
         {
-          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)
           {
-            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: any = isNaN(Number(clause.op.text)) ? clause.op.text : Number(clause.op.text);
+            let op1: any = typeof op2 === 'number' ? Number(s) : s;
+            switch (relation)
             {
-              if (s.indexOf(clause.op.text) >= 0)
-                return true;
-            }
-            else
-            {
-              let op2: any = isNaN(Number(clause.op.text)) ? clause.op.text : Number(clause.op.text);
-              let op1: any = 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;
-              }
+              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:
+        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:
@@ -743,3 +756,28 @@ export class FilterExpr
     // NOTREACHED
   }
 }
+
+export function cacheFilterExpr(o: any, types: any): void
+{
+  if (o)
+  {
+    delete o._filtercache;
+    let a: string[] = [];
+    for (let p in o)
+    {
+      let s: string;
+      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
+  }
+}

package/lib/ot-js/otclientengine.ts

@@ -34,13 +34,12 @@ export class OTClientEngine extends OTE.OTEngine
 			this.clientID = cid;
 			this.initialize();
       this.bReadOnly = false;
-      this.valCache = {};
 		}
 
 	initialize(): void
 		{
       if (this.prefailCache === undefined && this.clientSequenceNo > 0)
-        this.prefailCache = this.valCache;
+        this.prefailCache = this.toValue();
 			this.clientSequenceNo = 0;
 			this.isNeedAck = false;
 			this.isNeedResend = false;
@@ -71,11 +70,15 @@ export class OTClientEngine extends OTE.OTEngine
 
   toPartialValue(resourceName: string): any
     {
+      if (! this.valCache)
+        this.valCache = {};
       return this.valCache[resourceName];
     }
 
 	toValue(): any
 		{
+      if (! this.valCache)
+        this.valCache = this.stateLocal.toValue();
 			return this.valCache;
 		}
 
@@ -155,7 +158,7 @@ export class OTClientEngine extends OTE.OTEngine
 		{
       console.log('otclientengine: failbackToInitialState');
       if (this.prefailCache === undefined)
-        this.prefailCache = this.valCache;
+        this.prefailCache = this.toValue();
 			this.initialize();
 		}
 
@@ -164,7 +167,7 @@ export class OTClientEngine extends OTE.OTEngine
 		{
       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();
@@ -172,7 +175,7 @@ export 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');
 		}
 
@@ -284,7 +287,7 @@ export class OTClientEngine extends OTE.OTEngine
 						this.actionServerInterposedSentClient.compose(orig);
 
           // Let clients know
-          this.valCache = this.stateLocal.toValue();
+          delete this.valCache;
           this.emit('state');
 				}
 			}
@@ -318,7 +321,7 @@ export 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)

package/package.json

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