@scx-js/scx-data 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scx-js/scx-data",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "SCX Data",
   "license": "MIT",
   "author": "scx567888",
@@ -11,6 +11,6 @@
     "url": "https://github.com/scx567888/scx-js.git"
   },
   "dependencies": {
-    "@scx-js/scx-common": "0.1.1"
+    "@scx-js/scx-common": "0.1.2"
   }
 }

package/query/Query.js

@@ -55,6 +55,30 @@ class Query {
         return this;
     }
 
+    addWhere(... whereClauses){
+        return this;
+    }
+
+    addGroupBy(... groupByClauses){
+        return this;
+    }
+
+    addOrderBy(... orderByClauses){
+        return this;
+    }
+
+    removeWhereIf(filter){
+        return this;
+    }
+
+    removeGroupByIf(filter){
+        return this;
+    }
+
+    removeOrderByIf(filter){
+        return this;
+    }
+
 }
 
 export {Query};

package/query/QueryImpl.js

@@ -1,4 +1,5 @@
 import {Query} from "./Query.js";
+import {removeIf} from "@scx-js/scx-common"
 
 class QueryImpl extends Query {
 
@@ -23,20 +24,20 @@ class QueryImpl extends Query {
 
     where(...whereClauses) {
         this.clearWhere();
-        this.#addWhere(...whereClauses);
+        this.addWhere(...whereClauses);
         return this;
     }
 
     groupBy(...groupByClauses) {
         this.clearGroupBy();
-        this.#addGroupBy(...groupByClauses);
+        this.addGroupBy(...groupByClauses);
         return this;
     }
 
 
     orderBy(...orderByClauses) {
         this.clearOrderBy();
-        this.#addOrderBy(...orderByClauses);
+        this.addOrderBy(...orderByClauses);
         return this;
     }
 
@@ -96,13 +97,13 @@ class QueryImpl extends Query {
         return this;
     }
 
-    #addWhere(...whereClauses) {
+    addWhere(...whereClauses) {
         for (let whereClause of whereClauses) {
             if (whereClause == null) {
                 continue;
             }
             if (Array.isArray(whereClause)) {
-                this.#addWhere(...whereClause);
+                this.addWhere(...whereClause);
                 continue;
             }
             this.#where.push(whereClause);
@@ -110,13 +111,13 @@ class QueryImpl extends Query {
         return this;
     }
 
-    #addGroupBy(...groupByClauses) {
+    addGroupBy(...groupByClauses) {
         for (let groupByClause of groupByClauses) {
             if (groupByClause == null) {
                 continue;
             }
             if (Array.isArray(groupByClause)) {
-                this.#addGroupBy(...groupByClause);
+                this.addGroupBy(...groupByClause);
                 continue;
             }
             this.#groupBy.push(groupByClause);
@@ -124,13 +125,13 @@ class QueryImpl extends Query {
         return this;
     }
 
-    #addOrderBy(...orderByClauses) {
+    addOrderBy(...orderByClauses) {
         for (let orderByClause of orderByClauses) {
             if (orderByClause == null) {
                 continue;
             }
             if (Array.isArray(orderByClause)) {
-                this.#addOrderBy(...orderByClause);
+                this.addOrderBy(...orderByClause);
                 continue;
             }
             this.#orderBy.push(orderByClause);
@@ -138,6 +139,21 @@ class QueryImpl extends Query {
         return this;
     }
 
+    removeWhereIf(filter) {
+        removeIf(this.#where, filter);
+        return this;
+    }
+
+    removeGroupByIf(filter) {
+        removeIf(this.#groupBy, filter);
+        return this;
+    }
+
+    removeOrderByIf(filter) {
+        removeIf(this.#orderBy, filter);
+        return this;
+    }
+
 }
 
 export {QueryImpl};

package/query/QueryLike.js

@@ -81,6 +81,36 @@ class QueryLike extends Query {
         return this;
     }
 
+    addWhere(...whereClauses) {
+        this.query().addWhere(whereClauses);
+        return this;
+    }
+
+    addGroupBy(...groupByClauses) {
+        this.query().addGroupBy(groupByClauses);
+        return this;
+    }
+
+    addOrderBy(...orderByClauses) {
+        this.query().addOrderBy(orderByClauses);
+        return this;
+    }
+
+    removeWhereIf(filter) {
+        this.query().removeWhereIf(filter);
+        return this;
+    }
+
+    removeGroupByIf(filter) {
+        this.query().removeGroupByIf(filter);
+        return this;
+    }
+
+    removeOrderByIf(filter) {
+        this.query().removeOrderByIf(filter);
+        return this;
+    }
+
     toQuery() {
     }