@dra2020/baseclient 1.0.7 → 1.0.10

package/dist/filterexpr/filterexpr.d.ts

@@ -58,6 +58,9 @@ export declare class FilterExpr {
     set(expr: string): void;
     test(o: any, types?: any): boolean;
     asString(): string;
+    containsClause(expr: string): boolean;
+    addClause(expr: string): void;
+    removeClause(expr: string): void;
     asStringClause(clause: Clause): string;
     testClause(o: any, types: any, clause: Clause, prop?: string, relation?: TokType): boolean;
 }

package/dist/fsm/fsm.d.ts

@@ -63,6 +63,7 @@ export declare class FsmOnDone extends Fsm {
 }
 export declare class FsmSleep extends Fsm {
     delay: number;
+    timeoutHandle: any;
     constructor(env: FsmEnvironment, delay: number);
     tick(): void;
 }

package/dist/ot-js/otsession.d.ts

@@ -83,6 +83,8 @@ export interface SessionProps {
     loadFailed: boolean;
     accessMap: AccessMap;
     revisions: RevisionList;
+    expunged?: boolean;
+    expungeDate?: string;
     xprops?: {
         [prop: string]: string;
     };

package/lib/filterexpr/filterexpr.ts

@@ -484,6 +484,45 @@ function wordyDate(s: string): string
   return s;
 }
 
+function clauseEqual(c1: Clause, c2: Clause): boolean
+{
+  if (c1 == null && c2 == null) return true;
+  if (c1 == null || c2 == null) return false;
+  if (c1.op.tt === c2.op.tt)
+  {
+    if (c1.op.tt === TokType.Text)
+      return c1.op.text === c2.op.text;
+    else
+      return clauseEqual(c1.operand1, c2.operand1) && clauseEqual(c1.operand2, c2.operand2);
+  }
+  else
+    return false;
+}
+
+function containsClause(c: Clause, s: Clause): boolean
+{
+  if (clauseEqual(c, s))
+    return true;
+  if (c == null || s == null) return false;
+  return containsClause(c.operand1, s) || containsClause(c.operand2, s);
+}
+
+function removeClause(c: Clause, s: Clause): Clause
+{
+  if (c == null || (c.op.tt === TokType.Text && c.op.tt !== s.op.tt))
+    return c;
+  else if (clauseEqual(c, s))
+    return null;
+  else
+  {
+    c.operand1 = removeClause(c.operand1, s);
+    c.operand2 = removeClause(c.operand2, s);
+    if ((c.op.tt === TokType.And || c.op.tt === TokType.Or) && (c.operand1 == null || c.operand2 == null))
+      return c.operand1 || c.operand2;
+    return c;
+  }
+}
+
 export class FilterExpr
 {
   lexer: Lexer;
@@ -512,12 +551,47 @@ export class FilterExpr
     return this.asStringClause(this.parser.clause);
   }
 
+  containsClause(expr: string): boolean
+  {
+    let sub = new FilterExpr(this.lexer.coder, expr);
+    return containsClause(this.parser.clause, sub.parser.clause);
+  }
+
+  addClause(expr: string): void
+  {
+    let sub = new FilterExpr(this.lexer.coder, expr);
+    if (! containsClause(this.parser.clause, sub.parser.clause))
+    {
+      if (this.parser.clause)
+        this.parser.clauses = [ { op: { tt: TokType.And }, operand1: this.parser.clause, operand2: sub.parser.clause } ];
+      else
+        this.parser.clauses = [ sub.parser.clause ];
+    }
+  }
+
+  removeClause(expr: string): void
+  {
+    if (this.containsClause(expr))
+    {
+      let sub = new FilterExpr(this.lexer.coder, expr);
+      this.parser.clauses = [ removeClause(this.parser.clause, sub.parser.clause) ];
+    }
+  }
+
   asStringClause(clause: Clause): string
   {
     if (clause == null) return '';
-    if (clause.op.tt == TokType.Text) return `'${clause.op.text}'`;
+    if (clause.op.tt == TokType.Text)
+    {
+      this.lexer.set(clause.op.text);
+      if (this.lexer.tokens.length == 1 && this.lexer.tokens[0].tt === TokType.Text)
+        return clause.op.text;
+      else
+        return `'${clause.op.text}'`;
+    }
     let a: string[] = [];
-    a.push('(');
+    if (clause !== this.parser.clause)
+      a.push('(');
     switch (clause.op.tt)
     {
       case TokType.And:
@@ -535,8 +609,7 @@ export class FilterExpr
         a.push(this.asStringClause(clause.operand1));
         break;
       case TokType.Colon:
-        a.push(this.asStringClause(clause.operand1));
-        a.push(':');
+        a.push(`${this.asStringClause(clause.operand1)}:`);
         a.push(this.asStringClause(clause.operand2));
         break;
       case TokType.Equal:
@@ -551,7 +624,8 @@ export class FilterExpr
       default:
         throw 'Unexpected token in asString';
     }
-    a.push(')');
+    if (clause !== this.parser.clause)
+      a.push(')');
     return a.join(' ');
   }
 

package/lib/fsm/fsm.ts

@@ -291,6 +291,7 @@ export class FsmOnDone extends Fsm
 export class FsmSleep extends Fsm
 {
   delay: number;
+  timeoutHandle: any;
 
   constructor(env: FsmEnvironment, delay: number)
     {
@@ -300,10 +301,19 @@ export class FsmSleep extends Fsm
 
   tick(): void
     {
-      if (this.ready && this.state === FSM_STARTING)
+      // This allows canceling by simply setting state to done
+      if (this.done && this.timeoutHandle !== undefined)
+      {
+        clearTimeout(this.timeoutHandle);
+        delete this.timeoutHandle;
+      }
+      else if (this.ready && this.state === FSM_STARTING)
       {
         this.setState(FSM_PENDING);
-        setTimeout(() => { this.setState(FSM_DONE); }, this.delay);
+        this.timeoutHandle = setTimeout(() => {
+            delete this.timeoutHandle;
+            this.setState(FSM_DONE)
+          }, this.delay);
       }
     }
 }

package/lib/ot-js/otsession.ts

@@ -111,6 +111,8 @@ export interface SessionProps
 	loadFailed: boolean;
   accessMap: AccessMap;
   revisions: RevisionList;
+  expunged?: boolean;
+  expungeDate?: string;
   xprops?: { [prop: string]: string };
 }
 

package/package.json

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