@scx-js/scx-data 0.1.6 → 0.1.8

package/field_policy/FieldPolicy.js

@@ -1,10 +1,10 @@
 class FieldPolicy {
 
-    included(...fieldNames) {
+    include(...fieldNames) {
         return this;
     }
 
-    excluded(...fieldNames) {
+    exclude(...fieldNames) {
         return this;
     }
 
@@ -17,20 +17,35 @@ class FieldPolicy {
     clearFieldNames() {
     }
 
-    ignoreNullValue(ignoreNullValue) {
+    ignoreNull(ignoreNullValue) {
         return this;
     }
 
-    ignoreNullValue_() {
+    ignoreNull_() {
     }
 
-    fieldExpression(fieldName, expression) {
+    ignoreNull__(fieldName, ignoreNullValue) {
     }
 
-    fieldExpressions() {
+    removeIgnoreNull(fieldName) {
     }
 
-    clearFieldExpressions() {
+    ignoreNulls() {
+    }
+
+    clearIgnoreNulls() {
+    }
+
+    expression(fieldName, expression) {
+    }
+
+    expressions() {
+    }
+
+    removeExpression(fieldName) {
+    }
+
+    clearExpressions() {
     }
 
 }

package/field_policy/FieldPolicyBuilder.js

@@ -1,11 +1,11 @@
 import {FieldPolicyImpl} from "./FieldPolicyImpl.js";
 import {EXCLUDED, INCLUDED} from "./FilterMode.js";
 
-function includedAll() {
+function includeAll() {
     return new FieldPolicyImpl(EXCLUDED);
 }
 
-function excludedAll() {
+function excludeAll() {
     return new FieldPolicyImpl(INCLUDED);
 }
 
@@ -14,8 +14,8 @@ function excludedAll() {
  * @param fieldNames
  * @return {FieldPolicy}
  */
-function included(...fieldNames) {
-    return excludedAll().included(...fieldNames);
+function include(...fieldNames) {
+    return excludeAll().include(...fieldNames);
 }
 
 /**
@@ -23,23 +23,28 @@ function included(...fieldNames) {
  * @param fieldNames
  * @return {FieldPolicy}
  */
-function excluded(...fieldNames) {
-    return includedAll().excluded(...fieldNames);
+function exclude(...fieldNames) {
+    return includeAll().exclude(...fieldNames);
 }
 
-function ignoreNullValue(ignoreNullValue) {
-    return includedAll().ignoreNullValue(ignoreNullValue);
+function ignoreNull(ignoreNull) {
+    return includeAll().ignoreNull(ignoreNull);
 }
 
-function fieldExpression(fieldName, expression) {
-    return includedAll().fieldExpression(fieldName, expression);
+function ignoreNull__(fieldName, ignoreNull) {
+    return includeAll().ignoreNull__(fieldName, ignoreNull);
+}
+
+function expression(fieldName, expression) {
+    return includeAll().expression(fieldName, expression);
 }
 
 export {
-    includedAll,
-    excludedAll,
-    included,
-    excluded,
-    ignoreNullValue,
-    fieldExpression,
+    includeAll,
+    excludeAll,
+    include,
+    exclude,
+    ignoreNull,
+    ignoreNull__,
+    expression,
 };

package/field_policy/FieldPolicyImpl.js

@@ -5,18 +5,20 @@ class FieldPolicyImpl extends FieldPolicy {
 
     #filterMode;
     #fieldNames;
-    #fieldExpressions;
-    #ignoreNullValue;
+    #expressions;
+    #ignoreNulls;
+    #ignoreNull;
 
     constructor(filterMode) {
         super();
         this.#filterMode = filterMode;
         this.#fieldNames = new Set();
-        this.#fieldExpressions = new Map();
-        this.#ignoreNullValue = true;
+        this.#expressions = new Map();
+        this.#ignoreNulls = new Map();
+        this.#ignoreNull = true;
     }
 
-    included(...fieldNames) {
+    include(...fieldNames) {
         if (this.#filterMode === INCLUDED) {
             this.addFieldNames(...fieldNames);
         } else if (this.#filterMode === EXCLUDED) {
@@ -25,7 +27,7 @@ class FieldPolicyImpl extends FieldPolicy {
         return this;
     }
 
-    excluded(...fieldNames) {
+    exclude(...fieldNames) {
         if (this.#filterMode === EXCLUDED) {
             this.addFieldNames(...fieldNames);
         } else if (this.#filterMode === INCLUDED) {
@@ -47,26 +49,50 @@ class FieldPolicyImpl extends FieldPolicy {
         return this;
     }
 
-    ignoreNullValue(ignoreNullValue) {
-        this.#ignoreNullValue = ignoreNullValue;
+    ignoreNull(ignoreNullValue) {
+        this.#ignoreNull = ignoreNullValue;
         return this;
     }
 
-    ignoreNullValue_() {
-        return this.#ignoreNullValue;
+    ignoreNull_() {
+        return this.#ignoreNull;
     }
 
-    fieldExpression(fieldName, expression) {
-        this.#fieldExpressions.set(fieldName, expression);
+    ignoreNull__(fieldName, ignoreNull) {
+        this.#ignoreNulls.set(fieldName, ignoreNull);
         return this;
     }
 
-    fieldExpressions() {
-        return this.#fieldExpressions;
+    removeIgnoreNull(fieldName) {
+        this.#ignoreNulls.delete(fieldName);
+        return this;
+    }
+
+    ignoreNulls() {
+        return this.#ignoreNulls;
+    }
+
+    clearIgnoreNulls() {
+        this.#ignoreNulls.clear();
+        return this;
+    }
+
+    expression(fieldName, expression) {
+        this.#expressions.set(fieldName, expression);
+        return this;
+    }
+
+    expressions() {
+        return this.#expressions;
+    }
+
+    removeExpression(fieldName) {
+        this.#expressions.delete(fieldName);
+        return this;
     }
 
-    clearFieldExpressions() {
-        this.#fieldExpressions.clear();
+    clearExpressions() {
+        this.#expressions.clear();
         return this;
     }
 

package/field_policy/serializer/FieldPolicySerializer.js

@@ -14,8 +14,9 @@ class FieldPolicySerializer {
             "@type": "FieldPolicy",
             "filterMode": fieldPolicy.filterMode(),
             "fieldNames": fieldPolicy.fieldNames(),
-            "ignoreNullValue": fieldPolicy.ignoreNullValue_(),
-            "fieldExpressions": fieldPolicy.fieldExpressions(),
+            "ignoreNull": fieldPolicy.ignoreNull_(),
+            "ignoreNulls": fieldPolicy.ignoreNulls(),
+            "expressions": fieldPolicy.expressions(),
         };
     }
 

package/package.json

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