@scx-js/scx-data 0.1.8 → 0.2.0

package/index.js

@@ -8,8 +8,10 @@ export * from "./query/serializer/OrderBySerializer.js";
 export * from "./query/serializer/QuerySerializer.js";
 export * from "./query/serializer/WhereSerializer.js";
 export * from "./query/GroupBy.js";
-export * from "./query/Logic.js";
-export * from "./query/LogicType.js";
+export * from "./query/Junction.js";
+export * from "./query/And.js";
+export * from "./query/Or.js";
+export * from "./query/Not.js";
 export * from "./query/OrderBy.js";
 export * from "./query/OrderByType.js";
 export * from "./query/Query.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scx-js/scx-data",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "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.8"
+    "@scx-js/scx-common": "0.2.0"
   }
 }

package/query/And.js

@@ -0,0 +1,16 @@
+import {Junction} from "./Junction.js";
+import {Or} from "./Or.js";
+
+class And extends Junction {
+
+    and(...clauses) {
+        return this.add(new And().add(clauses));
+    }
+
+    or(...clauses) {
+        return this.add(new Or().add(clauses));
+    }
+
+}
+
+export {And};

package/query/{Logic.js → Junction.js}

@@ -1,42 +1,35 @@
 import {QueryLike} from "./QueryLike.js";
 import {
     BETWEEN,
-    EQUAL,
-    GREATER_THAN,
-    GREATER_THAN_OR_EQUAL,
+    EQ,
+    GT,
+    GTE,
     IN,
-    IS_NOT_NULL,
-    IS_NULL,
     JSON_CONTAINS,
     JSON_OVERLAPS,
-    LESS_THAN,
-    LESS_THAN_OR_EQUAL,
     LIKE,
     LIKE_REGEX,
+    LT,
+    LTE,
+    NE,
     NOT_BETWEEN,
-    NOT_EQUAL,
     NOT_IN,
     NOT_LIKE,
     NOT_LIKE_REGEX,
 } from "./WhereType.js";
 import {Where} from "./Where.js";
 import {QueryImpl} from "./QueryImpl.js";
+import {Not} from "./Not.js";
 
-class Logic extends QueryLike {
+class Junction extends QueryLike {
 
-    #logicType;
     #clauses;
 
-    constructor(logicType) {
+    constructor() {
         super();
-        this.#logicType = logicType;
         this.#clauses = [];
     }
 
-    logicType() {
-        return this.#logicType;
-    }
-
     clauses() {
         return this.#clauses;
     }
@@ -61,36 +54,27 @@ class Logic extends QueryLike {
     }
 
     eq(fieldName, value, ...options) {
-        return this.add(new Where(fieldName, EQUAL, value, null, ...options));
+        return this.add(new Where(fieldName, EQ, value, null, ...options));
     }
 
     ne(fieldName, value, ...options) {
-        return this.add(new Where(fieldName, NOT_EQUAL, value, null, ...options));
+        return this.add(new Where(fieldName, NE, value, null, ...options));
     }
 
     lt(fieldName, value, ...options) {
-        return this.add(new Where(fieldName, LESS_THAN, value, null, ...options));
+        return this.add(new Where(fieldName, LT, value, null, ...options));
     }
 
-    le(fieldName, value, ...options) {
-        return this.add(new Where(fieldName, LESS_THAN_OR_EQUAL, value, null, ...options));
+    lte(fieldName, value, ...options) {
+        return this.add(new Where(fieldName, LTE, value, null, ...options));
     }
 
     gt(fieldName, value, ...options) {
-        return this.add(new Where(fieldName, GREATER_THAN, value, null, ...options));
-    }
-
-    ge(fieldName, value, ...options) {
-        return this.add(new Where(fieldName, GREATER_THAN_OR_EQUAL, value, null, ...options));
-    }
-
-
-    isNull(fieldName, ...options) {
-        return this.add(new Where(fieldName, IS_NULL, null, null, ...options));
+        return this.add(new Where(fieldName, GT, value, null, ...options));
     }
 
-    isNotNull(fieldName, ...options) {
-        return this.add(new Where(fieldName, IS_NOT_NULL, null, null, ...options));
+    gte(fieldName, value, ...options) {
+        return this.add(new Where(fieldName, GTE, value, null, ...options));
     }
 
     like(fieldName, value, ...options) {
@@ -133,6 +117,18 @@ class Logic extends QueryLike {
         return this.add(new Where(fieldName, JSON_OVERLAPS, value, null, ...options));
     }
 
+    and(...clauses) {
+        // 因为 js 不允许 循环依赖 所以 这个方法迁移到子类实现
+    }
+
+    or(...clauses) {
+        // 因为 js 不允许 循环依赖 所以 这个方法迁移到子类实现
+    }
+
+    not(clause) {
+        return this.add(new Not(clause));
+    }
+
     toQuery() {
         return new QueryImpl().where(this);
     }
@@ -140,5 +136,5 @@ class Logic extends QueryLike {
 }
 
 export {
-    Logic,
+    Junction,
 };

package/query/Not.js

@@ -0,0 +1,22 @@
+import {QueryLike} from "./QueryLike.js";
+import {QueryImpl} from "./QueryImpl.js";
+
+class Not extends QueryLike {
+
+    #clause;
+
+    constructor(clause) {
+        super();
+        this.#clause = clause;
+    }
+
+    clause() {
+        return this.clause;
+    }
+
+    toQuery() {
+        return new QueryImpl().where(this);
+    }
+}
+
+export {Not};

package/query/Or.js

@@ -0,0 +1,17 @@
+import {Junction} from "./Junction.js";
+import {And} from "./And.js";
+
+class Or extends Junction {
+
+    // 因为 js 不允许 循环依赖 所以 这两个方法迁移到子类
+    and(...clauses) {
+        return this.add(new And().add(clauses));
+    }
+
+    or(...clauses) {
+        return this.add(new Or().add(clauses));
+    }
+
+}
+
+export {Or};

package/query/Query.js

@@ -1,6 +1,6 @@
 class Query {
 
-    where(...whereClauses) {
+    where(where) {
         return this;
     }
 
@@ -55,10 +55,6 @@ class Query {
         return this;
     }
 
-    addWhere(...whereClauses) {
-        return this;
-    }
-
     addGroupBy(...groupByClauses) {
         return this;
     }
@@ -67,10 +63,6 @@ class Query {
         return this;
     }
 
-    removeWhereIf(filter) {
-        return this;
-    }
-
     removeGroupByIf(filter) {
         return this;
     }

package/query/QueryBuilder.js

@@ -1,37 +1,36 @@
 import {WhereClause} from "./WhereClause.js";
 import {
     BETWEEN,
-    EQUAL,
-    GREATER_THAN,
-    GREATER_THAN_OR_EQUAL,
+    EQ,
+    GT,
+    GTE,
     IN,
-    IS_NOT_NULL,
-    IS_NULL,
     JSON_CONTAINS,
     JSON_OVERLAPS,
-    LESS_THAN,
-    LESS_THAN_OR_EQUAL,
     LIKE,
     LIKE_REGEX,
+    LT,
+    LTE,
+    NE,
     NOT_BETWEEN,
-    NOT_EQUAL,
     NOT_IN,
     NOT_LIKE,
     NOT_LIKE_REGEX,
 } from "./WhereType.js";
 import {Where} from "./Where.js";
 import {QueryImpl} from "./QueryImpl.js";
-import {AND, OR} from "./LogicType.js";
 import {OrderBy} from "./OrderBy.js";
 import {ASC, DESC} from "./OrderByType.js";
-import {Logic} from "./Logic.js";
+import {Not} from "./Not.js";
+import {And} from "./And.js";
+import {Or} from "./Or.js";
 
 function query(oldQuery) {
     return new QueryImpl(oldQuery);
 }
 
-function where(...whereClauses) {
-    return new QueryImpl().where(...whereClauses);
+function where(whereClauses) {
+    return new QueryImpl().where(whereClauses);
 }
 
 function groupBy(...groupByClauses) {
@@ -51,11 +50,15 @@ function limit(numberOfRows) {
 }
 
 function and(...clauses) {
-    return new Logic(AND).add(...clauses);
+    return new And().add(...clauses);
 }
 
 function or(...clauses) {
-    return new Logic(OR).add(...clauses);
+    return new Or().add(...clauses);
+}
+
+function not(clause) {
+    return new Not(clause);
 }
 
 function asc(name, ...options) {
@@ -67,36 +70,27 @@ function desc(name, ...options) {
 }
 
 function eq(fieldName, value, ...options) {
-    return new Where(fieldName, EQUAL, value, null, ...options);
+    return new Where(fieldName, EQ, value, null, ...options);
 }
 
 function ne(fieldName, value, ...options) {
-    return new Where(fieldName, NOT_EQUAL, value, null, ...options);
+    return new Where(fieldName, NE, value, null, ...options);
 }
 
-
 function lt(fieldName, value, ...options) {
-    return new Where(fieldName, LESS_THAN, value, null, ...options);
+    return new Where(fieldName, LT, value, null, ...options);
 }
 
-function le(fieldName, value, ...options) {
-    return new Where(fieldName, LESS_THAN_OR_EQUAL, value, null, ...options);
+function lte(fieldName, value, ...options) {
+    return new Where(fieldName, LTE, value, null, ...options);
 }
 
 function gt(fieldName, value, ...options) {
-    return new Where(fieldName, GREATER_THAN, value, null, ...options);
-}
-
-function ge(fieldName, value, ...options) {
-    return new Where(fieldName, GREATER_THAN_OR_EQUAL, value, null, ...options);
-}
-
-function isNull(fieldName, ...options) {
-    return new Where(fieldName, IS_NULL, null, null, ...options);
+    return new Where(fieldName, GT, value, null, ...options);
 }
 
-function isNotNull(fieldName, ...options) {
-    return new Where(fieldName, IS_NOT_NULL, null, null, ...options);
+function gte(fieldName, value, ...options) {
+    return new Where(fieldName, GTE, value, null, ...options);
 }
 
 function like(fieldName, value, ...options) {
@@ -153,16 +147,15 @@ export {
     limit,
     and,
     or,
+    not,
     asc,
     desc,
     eq,
     ne,
     lt,
-    le,
+    lte,
     gt,
-    ge,
-    isNull,
-    isNotNull,
+    gte,
     like,
     notLike,
     likeRegex,

package/query/QueryImpl.js

@@ -15,16 +15,15 @@ class QueryImpl extends Query {
      */
     constructor(old) {
         super();
-        this.#where = [];
+        this.#where = null;
         this.#groupBy = [];
         this.#orderBy = [];
         this.#offset = null;
         this.#limit = null;
     }
 
-    where(...whereClauses) {
-        this.clearWhere();
-        this.addWhere(...whereClauses);
+    where(where) {
+        this.#where = where;
         return this;
     }
 
@@ -73,7 +72,7 @@ class QueryImpl extends Query {
     }
 
     clearWhere() {
-        this.#where = [];
+        this.#where = null;
         return this;
     }
 
@@ -97,20 +96,6 @@ class QueryImpl extends Query {
         return this;
     }
 
-    addWhere(...whereClauses) {
-        for (let whereClause of whereClauses) {
-            if (whereClause == null) {
-                continue;
-            }
-            if (Array.isArray(whereClause)) {
-                this.addWhere(...whereClause);
-                continue;
-            }
-            this.#where.push(whereClause);
-        }
-        return this;
-    }
-
     addGroupBy(...groupByClauses) {
         for (let groupByClause of groupByClauses) {
             if (groupByClause == null) {

package/query/QueryLike.js

@@ -11,8 +11,8 @@ class QueryLike extends Query {
         return this.#query;
     }
 
-    where(...whereClauses) {
-        this.query().where(...whereClauses);
+    where(where) {
+        this.query().where(where);
         return this;
     }
 
@@ -81,11 +81,6 @@ class QueryLike extends Query {
         return this;
     }
 
-    addWhere(...whereClauses) {
-        this.query().addWhere(whereClauses);
-        return this;
-    }
-
     addGroupBy(...groupByClauses) {
         this.query().addGroupBy(groupByClauses);
         return this;
@@ -96,11 +91,6 @@ class QueryLike extends Query {
         return this;
     }
 
-    removeWhereIf(filter) {
-        this.query().removeWhereIf(filter);
-        return this;
-    }
-
     removeGroupByIf(filter) {
         this.query().removeGroupByIf(filter);
         return this;

package/query/WhereType.js

@@ -1,42 +1,32 @@
-/**
- * 为空
- */
-const IS_NULL = "IS_NULL";
-
-/**
- * 不为空
- */
-const IS_NOT_NULL = "IS_NOT_NULL";
-
 /**
  * 等于
  */
-const EQUAL = "EQUAL";
+const EQ = "EQ";
 
 /**
  * 不等于
  */
-const NOT_EQUAL = "NOT_EQUAL";
+const NE = "NE";
 
 /**
  * 小于
  */
-const LESS_THAN = "LESS_THAN";
+const LT = "LT";
 
 /**
  * 小于等于
  */
-const LESS_THAN_OR_EQUAL = "LESS_THAN";
+const LTE = "LTE";
 
 /**
  * 大于
  */
-const GREATER_THAN = "GREATER_THAN";
+const GT = "GT";
 
 /**
  * 大于等于
  */
-const GREATER_THAN_OR_EQUAL = "GREATER_THAN";
+const GTE = "GTE";
 
 /**
  * Like
@@ -88,14 +78,12 @@ const JSON_OVERLAPS = "JSON_OVERLAPS";
 
 
 export {
-    IS_NULL,
-    IS_NOT_NULL,
-    EQUAL,
-    NOT_EQUAL,
-    LESS_THAN,
-    LESS_THAN_OR_EQUAL,
-    GREATER_THAN,
-    GREATER_THAN_OR_EQUAL,
+    EQ,
+    NE,
+    LT,
+    LTE,
+    GT,
+    GTE,
     LIKE,
     NOT_LIKE,
     LIKE_REGEX,

package/query/serializer/WhereSerializer.js

@@ -2,7 +2,9 @@ import {Where} from "../Where.js";
 import {isArray} from "@scx-js/scx-common";
 import {Query} from "../Query.js";
 import {WhereClause} from "../WhereClause.js";
-import {Logic} from "../Logic.js";
+import {And} from "../And.js";
+import {Or} from "../Or.js";
+import {Not} from "../Not.js";
 
 class WhereSerializer {
 
@@ -13,8 +15,14 @@ class WhereSerializer {
         if (obj instanceof WhereClause) {
             return this.serializeWhereClause(obj);
         }
-        if (obj instanceof Logic) {
-            return this.serializeLogic(obj);
+        if (obj instanceof And) {
+            return this.serializeAnd(obj);
+        }
+        if (obj instanceof Or) {
+            return this.serializeOr(obj);
+        }
+        if (obj instanceof Not) {
+            return this.serializeNot(obj);
         }
         if (obj instanceof Where) {
             return this.serializeWhere(obj);
@@ -40,14 +48,27 @@ class WhereSerializer {
         };
     }
 
-    serializeLogic(l) {
+    serializeAnd(l) {
         return {
-            "@type": "Logic",
-            "logicType": l.logicType(),
+            "@type": "And",
             "clauses": this.serializeAll(l.clauses()),
         };
     }
 
+    serializeOr(l) {
+        return {
+            "@type": "Or",
+            "clauses": this.serializeAll(l.clauses()),
+        };
+    }
+
+    serializeNot(l) {
+        return {
+            "@type": "Not",
+            "clauses": this.serialize(l.clause()),
+        };
+    }
+
     serializeWhere(w) {
         return {
             "@type": "Where",

package/query/LogicType.js

@@ -1,7 +0,0 @@
-const OR = "OR";
-const AND = "AND";
-
-export {
-    OR,
-    AND,
-};