@scx-js/scx-data 0.1.3 → 0.1.5

package/field_policy/FieldPolicy.js

@@ -0,0 +1,40 @@
+class FieldPolicy {
+
+    included(...fieldNames) {
+        return this;
+    }
+
+    excluded(...fieldNames) {
+        return this;
+    }
+
+    filterMode() {
+    }
+
+    fieldNames() {
+    }
+
+    clearFieldNames() {
+    }
+
+    ignoreNullValue(ignoreNullValue) {
+        return this;
+    }
+
+    ignoreNullValue_() {
+    }
+
+    fieldExpression(fieldName, expression) {
+    }
+
+    fieldExpressions() {
+    }
+
+    clearFieldExpressions() {
+    }
+
+}
+
+export {
+    FieldPolicy,
+};

package/field_policy/FieldPolicyBuilder.js

@@ -0,0 +1,45 @@
+import {FieldPolicyImpl} from "./FieldPolicyImpl.js";
+import {EXCLUDED, INCLUDED} from "./FilterMode.js";
+
+function includedAll() {
+    return new FieldPolicyImpl(EXCLUDED);
+}
+
+function excludedAll() {
+    return new FieldPolicyImpl(INCLUDED);
+}
+
+/**
+ *
+ * @param fieldNames
+ * @return {FieldPolicy}
+ */
+function included(...fieldNames) {
+    return excludedAll().included(fieldNames);
+}
+
+/**
+ *
+ * @param fieldNames
+ * @return {FieldPolicy}
+ */
+function excluded(...fieldNames) {
+    return includedAll().excluded(fieldNames);
+}
+
+function ignoreNullValue(ignoreNullValue) {
+    return includedAll().ignoreNullValue(ignoreNullValue);
+}
+
+function fieldExpression(fieldName, expression) {
+    return includedAll().fieldExpression(fieldName, expression);
+}
+
+export {
+    includedAll,
+    excludedAll,
+    included,
+    excluded,
+    ignoreNullValue,
+    fieldExpression,
+};

package/{field_filter/FieldFilterImpl.js → field_policy/FieldPolicyImpl.js}

@@ -1,20 +1,22 @@
 import {EXCLUDED, INCLUDED} from "./FilterMode.js";
-import {FieldFilter} from "./FieldFilter.js";
+import {FieldPolicy} from "./FieldPolicy.js";
 
-class FieldFilterImpl extends FieldFilter {
+class FieldPolicyImpl extends FieldPolicy {
 
     #filterMode;
     #fieldNames;
+    #fieldExpressions;
     #ignoreNullValue;
 
     constructor(filterMode) {
         super();
         this.#filterMode = filterMode;
         this.#fieldNames = new Set();
+        this.#fieldExpressions = new Map();
         this.#ignoreNullValue = true;
     }
 
-    addIncluded(...fieldNames) {
+    included(...fieldNames) {
         if (this.#filterMode === INCLUDED) {
             this.addFieldNames(...fieldNames);
         } else if (this.#filterMode === EXCLUDED) {
@@ -23,7 +25,7 @@ class FieldFilterImpl extends FieldFilter {
         return this;
     }
 
-    addExcluded(...fieldNames) {
+    excluded(...fieldNames) {
         if (this.#filterMode === EXCLUDED) {
             this.addFieldNames(...fieldNames);
         } else if (this.#filterMode === INCLUDED) {
@@ -32,12 +34,17 @@ class FieldFilterImpl extends FieldFilter {
         return this;
     }
 
-    removeIncluded(...fieldNames) {
-        return this.addExcluded(...fieldNames);
+    filterMode() {
+        return this.#filterMode;
+    }
+
+    fieldNames() {
+        return Array.from(this.#fieldNames);
     }
 
-    removeExcluded(...fieldNames) {
-        return this.addIncluded(...fieldNames);
+    clearFieldNames() {
+        this.#fieldNames.clear();
+        return this;
     }
 
     ignoreNullValue(ignoreNullValue) {
@@ -45,20 +52,21 @@ class FieldFilterImpl extends FieldFilter {
         return this;
     }
 
-    getFilterMode() {
-        return this.#filterMode;
+    ignoreNullValue_() {
+        return this.#ignoreNullValue;
     }
 
-    getFieldNames() {
-        return Array.from(this.#fieldNames);
+    fieldExpression(fieldName, expression) {
+        this.#fieldExpressions.set(fieldName, expression);
+        return this;
     }
 
-    getIgnoreNullValue() {
-        return this.#ignoreNullValue;
+    fieldExpressions() {
+        return this.#fieldExpressions;
     }
 
-    clear() {
-        this.#fieldNames.clear();
+    clearFieldExpressions() {
+        this.#fieldExpressions.clear();
         return this;
     }
 
@@ -78,4 +86,4 @@ class FieldFilterImpl extends FieldFilter {
 
 }
 
-export {FieldFilterImpl};
+export {FieldPolicyImpl};

package/field_policy/serializer/FieldPolicySerializer.js

@@ -0,0 +1,29 @@
+import {FieldPolicy} from "../FieldPolicy.js";
+
+class FieldPolicySerializer {
+
+    serialize(obj) {
+        if (obj instanceof FieldPolicy) {
+            return this.serializeFieldPolicy(obj);
+        }
+        return obj;
+    }
+
+    serializeFieldPolicy(fieldPolicy) {
+        return {
+            "@type": "FieldPolicy",
+            "filterMode": fieldPolicy.filterMode(),
+            "fieldNames": fieldPolicy.fieldNames(),
+            "ignoreNullValue": fieldPolicy.ignoreNullValue_(),
+            "fieldExpressions": fieldPolicy.fieldExpressions(),
+        };
+    }
+
+}
+
+const FIELD_POLICY_SERIALIZER = new FieldPolicySerializer();
+
+export {
+    FIELD_POLICY_SERIALIZER,
+    FieldPolicySerializer,
+};

package/index.js

@@ -1,8 +1,8 @@
-export * from "./field_filter/serializer/FieldFilterSerializer.js";
-export * from "./field_filter/FieldFilter.js";
-export * from "./field_filter/FieldFilterBuilder.js";
-export * from "./field_filter/FieldFilterImpl.js";
-export * from "./field_filter/FilterMode.js";
+export * from "./field_policy/serializer/FieldPolicySerializer.js";
+export * from "./field_policy/FieldPolicy.js";
+export * from "./field_policy/FieldPolicyBuilder.js";
+export * from "./field_policy/FieldPolicyImpl.js";
+export * from "./field_policy/FilterMode.js";
 export * from "./query/serializer/GroupBySerializer.js";
 export * from "./query/serializer/OrderBySerializer.js";
 export * from "./query/serializer/QuerySerializer.js";

package/package.json

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

package/query/Query.js

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

package/query/QueryImpl.js

@@ -1,5 +1,5 @@
 import {Query} from "./Query.js";
-import {removeIf} from "@scx-js/scx-common"
+import {removeIf} from "@scx-js/scx-common";
 
 class QueryImpl extends Query {
 

package/field_filter/FieldFilter.js

@@ -1,40 +0,0 @@
-class FieldFilter {
-
-    addIncluded(...fieldNames) {
-        return this;
-    }
-
-    addExcluded(...fieldNames) {
-        return this;
-    }
-
-    removeIncluded(...fieldNames) {
-        return this;
-    }
-
-    removeExcluded(...fieldNames) {
-        return this;
-    }
-
-    ignoreNullValue(ignoreNullValue) {
-        return this;
-    }
-
-    getFilterMode() {
-    }
-
-    getFieldNames() {
-    }
-
-    getIgnoreNullValue() {
-    }
-
-    clear() {
-        return this;
-    }
-
-}
-
-export {
-    FieldFilter,
-};

package/field_filter/FieldFilterBuilder.js

@@ -1,25 +0,0 @@
-import {FieldFilterImpl} from "./FieldFilterImpl.js";
-import {EXCLUDED, INCLUDED} from "./FilterMode.js";
-
-/**
- *
- * @param fieldNames
- * @return {FieldFilter}
- */
-function ofIncluded(...fieldNames) {
-    return new FieldFilterImpl(INCLUDED).addIncluded(...fieldNames);
-}
-
-/**
- *
- * @param fieldNames
- * @return {FieldFilter}
- */
-function ofExcluded(...fieldNames) {
-    return new FieldFilterImpl(EXCLUDED).addExcluded(...fieldNames);
-}
-
-export {
-    ofIncluded,
-    ofExcluded,
-};

package/field_filter/serializer/FieldFilterSerializer.js

@@ -1,28 +0,0 @@
-import {FieldFilter} from "../FieldFilter.js";
-
-class FieldFilterSerializer {
-
-    serialize(obj) {
-        if (obj instanceof FieldFilter) {
-            return this.serializeFieldFilter(obj);
-        }
-        return obj;
-    }
-
-    serializeFieldFilter(fieldFilter) {
-        return {
-            "@type": "FieldFilter",
-            "filterMode": fieldFilter.getFilterMode(),
-            "fieldNames": fieldFilter.getFieldNames(),
-            "ignoreNullValue": fieldFilter.getIgnoreNullValue(),
-        };
-    }
-
-}
-
-const FIELD_FILTER_SERIALIZER = new FieldFilterSerializer();
-
-export {
-    FIELD_FILTER_SERIALIZER,
-    FieldFilterSerializer,
-};