@dra2020/baseclient 1.0.9 → 1.0.10

package/dist/baseclient.js

@@ -597,6 +597,40 @@ function wordyDate(s) {
     // But this is close enough to match what gets displayed by "prettyDate" while also letting selection by month year
     return s;
 }
+function clauseEqual(c1, c2) {
+    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, s) {
+    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, s) {
+    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;
+    }
+}
 class FilterExpr {
     constructor(coder, expr) {
         this.lexer = new Lexer(coder);
@@ -614,13 +648,38 @@ class FilterExpr {
     asString() {
         return this.asStringClause(this.parser.clause);
     }
+    containsClause(expr) {
+        let sub = new FilterExpr(this.lexer.coder, expr);
+        return containsClause(this.parser.clause, sub.parser.clause);
+    }
+    addClause(expr) {
+        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) {
+        if (this.containsClause(expr)) {
+            let sub = new FilterExpr(this.lexer.coder, expr);
+            this.parser.clauses = [removeClause(this.parser.clause, sub.parser.clause)];
+        }
+    }
     asStringClause(clause) {
         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 = [];
-        a.push('(');
+        if (clause !== this.parser.clause)
+            a.push('(');
         switch (clause.op.tt) {
             case TokType.And:
                 a.push(this.asStringClause(clause.operand1));
@@ -637,8 +696,7 @@ 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:
@@ -653,7 +711,8 @@ class FilterExpr {
             default:
                 throw 'Unexpected token in asString';
         }
-        a.push(')');
+        if (clause !== this.parser.clause)
+            a.push(')');
         return a.join(' ');
     }
     testClause(o, types, clause, prop, relation) {