@fastcar/core 0.3.13 → 0.3.14

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@fastcar/core",
-	"version": "0.3.13",
+	"version": "0.3.14",
 	"homepage": "https://github.com/williamDazhangyu/fast-car",
 	"main": "target/index.js",
 	"author": "william_zhong",

package/src/utils/FilterCondition.ts

@@ -0,0 +1,49 @@
+import ValidationUtil from "./ValidationUtil";
+
+export default class FilterCondition {
+	private where: { [key: string]: any };
+
+	constructor(where?: { [key: string]: any }, info?: { field?: string[]; excludeField?: string[] }) {
+		this.where = {};
+		if (ValidationUtil.isNotNull(where) && where) {
+			this.addFiled(where, info);
+		}
+	}
+
+	//过滤空的值
+	filterNull(excludeField: string[] = []) {
+		let keys = Object.keys(this.where);
+		keys.forEach((key) => {
+			let value = Reflect.get(this.where, key);
+			if (!excludeField.includes(key) && !ValidationUtil.isNotMinSize(value, 1)) {
+				Reflect.deleteProperty(this.where, key);
+			}
+		});
+
+		return this;
+	}
+
+	addFiled(where: { [key: string]: any }, info?: { field?: string[]; excludeField?: string[] }) {
+		let { field = [], excludeField = [] } = info || {};
+		let all = field.length == 0 && excludeField.length == 0;
+
+		for (let key in where) {
+			if (all || (field.length > 0 && field.includes(key)) || (field.length == 0 && !excludeField.includes(key))) {
+				let value = where[key];
+				//排除基础类型,数组和空对象
+				if (ValidationUtil.isNotNull(value) && ValidationUtil.isObject(value) && !ValidationUtil.isArray(value, "array")) {
+					let beforeObj = Reflect.get(this.where, key) || {};
+					Reflect.set(this.where, key, Object.assign({}, beforeObj, where[key]));
+				} else {
+					Reflect.set(this.where, key, value);
+				}
+			}
+		}
+
+		return this;
+	}
+
+	toObject() {
+		return this.where;
+	}
+}

package/src/utils/ValidationUtil.ts

@@ -68,7 +68,15 @@ export default class ValidationUtil {
 			return param.length >= value;
 		}
 
-		let v = ValidationUtil.isNotNull(param) ? param.toString() : "";
+		if (TypeUtil.isMap(param) || TypeUtil.isSet(param)) {
+			return param.size >= value;
+		}
+
+		if (ValidationUtil.isNull(param)) {
+			return 0 >= value;
+		}
+
+		let v = param.toString();
 		return v.length >= value;
 	}
 

package/src/utils.ts

@@ -9,6 +9,7 @@ import MixTool from "./utils/Mix";
 import TypeUtil from "./utils/TypeUtil";
 import ValidationUtil from "./utils/ValidationUtil";
 import IPUtils from "./utils/IPUtils";
+import FilterCondition from "./utils/FilterCondition";
 
 //实用工具集合类
-export { DateUtil, DataFormat, CryptoUtil, FileUtil, TypeUtil, ValidationUtil, FormatStr, ClassUtils, ClassLoader, MixTool, IPUtils };
+export { DateUtil, DataFormat, CryptoUtil, FileUtil, TypeUtil, ValidationUtil, FormatStr, ClassUtils, ClassLoader, MixTool, IPUtils, FilterCondition };

package/target/utils/FilterCondition.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ValidationUtil_1 = require("./ValidationUtil");
+class FilterCondition {
+    where;
+    constructor(where, info) {
+        this.where = {};
+        if (ValidationUtil_1.default.isNotNull(where) && where) {
+            this.addFiled(where, info);
+        }
+    }
+    //过滤空的值
+    filterNull(excludeField = []) {
+        let keys = Object.keys(this.where);
+        keys.forEach((key) => {
+            let value = Reflect.get(this.where, key);
+            if (!excludeField.includes(key) && !ValidationUtil_1.default.isNotMinSize(value, 1)) {
+                Reflect.deleteProperty(this.where, key);
+            }
+        });
+        return this;
+    }
+    addFiled(where, info) {
+        let { field = [], excludeField = [] } = info || {};
+        let all = field.length == 0 && excludeField.length == 0;
+        for (let key in where) {
+            if (all || (field.length > 0 && field.includes(key)) || (field.length == 0 && !excludeField.includes(key))) {
+                let value = where[key];
+                //排除基础类型,数组和空对象
+                if (ValidationUtil_1.default.isNotNull(value) && ValidationUtil_1.default.isObject(value) && !ValidationUtil_1.default.isArray(value, "array")) {
+                    let beforeObj = Reflect.get(this.where, key) || {};
+                    Reflect.set(this.where, key, Object.assign({}, beforeObj, where[key]));
+                }
+                else {
+                    Reflect.set(this.where, key, value);
+                }
+            }
+        }
+        return this;
+    }
+    toObject() {
+        return this.where;
+    }
+}
+exports.default = FilterCondition;

package/target/utils/ValidationUtil.js

@@ -55,7 +55,13 @@ class ValidationUtil {
         if (Array.isArray(param)) {
             return param.length >= value;
         }
-        let v = ValidationUtil.isNotNull(param) ? param.toString() : "";
+        if (TypeUtil_1.default.isMap(param) || TypeUtil_1.default.isSet(param)) {
+            return param.size >= value;
+        }
+        if (ValidationUtil.isNull(param)) {
+            return 0 >= value;
+        }
+        let v = param.toString();
         return v.length >= value;
     }
     static isNotMaxSize(param, value) {

package/target/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IPUtils = exports.MixTool = exports.ClassLoader = exports.ClassUtils = exports.FormatStr = exports.ValidationUtil = exports.TypeUtil = exports.FileUtil = exports.CryptoUtil = exports.DataFormat = exports.DateUtil = void 0;
+exports.FilterCondition = exports.IPUtils = exports.MixTool = exports.ClassLoader = exports.ClassUtils = exports.FormatStr = exports.ValidationUtil = exports.TypeUtil = exports.FileUtil = exports.CryptoUtil = exports.DataFormat = exports.DateUtil = void 0;
 const ClassLoader_1 = require("./utils/ClassLoader");
 exports.ClassLoader = ClassLoader_1.default;
 const ClassUtils_1 = require("./utils/ClassUtils");
@@ -23,3 +23,5 @@ const ValidationUtil_1 = require("./utils/ValidationUtil");
 exports.ValidationUtil = ValidationUtil_1.default;
 const IPUtils_1 = require("./utils/IPUtils");
 exports.IPUtils = IPUtils_1.default;
+const FilterCondition_1 = require("./utils/FilterCondition");
+exports.FilterCondition = FilterCondition_1.default;

package/utils.d.ts

@@ -180,3 +180,13 @@ export class MixTool {
 export class IPUtils {
 	static isInnerIP(ip: string): boolean;
 }
+
+export class FilterCondition {
+	constructor(where?: { [key: string]: any }, info?: { field?: string[]; excludeField?: string[] });
+
+	filterNull(excludeField?: string[]): this;
+
+	addFiled(where: { [key: string]: any }, info?: { field?: string[]; excludeField?: string[] }): this;
+
+	toObject(): { [key: string]: any };
+}