@fastcar/core 0.2.60 → 0.2.62

package/target/utils/TypeUtil.js

@@ -1,53 +1,53 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const FileUtil_1 = require("./FileUtil");
-const BasicTypes = ["boolean", "number", "string"];
-class TypeUtil {
-    static isFunction(f) {
-        let typeName = typeof f;
-        return typeName == "function";
-    }
-    static isClass(f) {
-        if (f.prototype === undefined) {
-            return false;
-        }
-        if (!f.prototype.constructor) {
-            return false;
-        }
-        return TypeUtil.isFunction(f);
-    }
-    static isString(str) {
-        let typeName = typeof str;
-        return typeName == "string";
-    }
-    static isObject(f) {
-        let typeName = typeof f;
-        return typeName == "object";
-    }
-    //忽略.d.ts文件
-    static isTSORJS(fp) {
-        let suffix = FileUtil_1.default.getSuffix(fp);
-        return ["ts", "js"].includes(suffix) && !fp.endsWith(".d.ts");
-    }
-    static isPromise(f) {
-        return f.constructor.name === "AsyncFunction";
-    }
-    static isArray(value) {
-        return Array.isArray(value);
-    }
-    static isDate(value) {
-        return value instanceof Date;
-    }
-    //是否为基本类型
-    static isBasic(name) {
-        let fname = name.toLowerCase();
-        return BasicTypes.includes(fname);
-    }
-    static isMap(value) {
-        return value instanceof Map;
-    }
-    static isSet(value) {
-        return value instanceof Set;
-    }
-}
-exports.default = TypeUtil;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FileUtil_1 = require("./FileUtil");
+const BasicTypes = ["boolean", "number", "string"];
+class TypeUtil {
+    static isFunction(f) {
+        let typeName = typeof f;
+        return typeName == "function";
+    }
+    static isClass(f) {
+        if (f.prototype === undefined) {
+            return false;
+        }
+        if (!f.prototype.constructor) {
+            return false;
+        }
+        return TypeUtil.isFunction(f);
+    }
+    static isString(str) {
+        let typeName = typeof str;
+        return typeName == "string";
+    }
+    static isObject(f) {
+        let typeName = typeof f;
+        return typeName == "object";
+    }
+    //忽略.d.ts文件
+    static isTSORJS(fp) {
+        let suffix = FileUtil_1.default.getSuffix(fp);
+        return ["ts", "js"].includes(suffix) && !fp.endsWith(".d.ts");
+    }
+    static isPromise(f) {
+        return f.constructor.name === "AsyncFunction";
+    }
+    static isArray(value) {
+        return Array.isArray(value);
+    }
+    static isDate(value) {
+        return value instanceof Date;
+    }
+    //是否为基本类型
+    static isBasic(name) {
+        let fname = name.toLowerCase();
+        return BasicTypes.includes(fname);
+    }
+    static isMap(value) {
+        return value instanceof Map;
+    }
+    static isSet(value) {
+        return value instanceof Set;
+    }
+}
+exports.default = TypeUtil;

package/target/utils/ValidationUtil.js

@@ -1,118 +1,123 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const TypeUtil_1 = require("./TypeUtil");
-//类型校验器
-class ValidationUtil {
-    //是否为空
-    static isNotNull(param) {
-        if (param != undefined && param != null) {
-            if (TypeUtil_1.default.isString(param)) {
-                return param.length > 0;
-            }
-            if (TypeUtil_1.default.isObject(param)) {
-                if (TypeUtil_1.default.isDate(param) || TypeUtil_1.default.isMap(param) || TypeUtil_1.default.isSet(param)) {
-                    return true;
-                }
-                return Reflect.ownKeys(param).length > 0;
-            }
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-    static isNull(param) {
-        return !ValidationUtil.isNotNull(param);
-    }
-    static isNumber(param) {
-        return typeof param === "number" && !isNaN(param);
-    }
-    static isString(param) {
-        return typeof param === "string";
-    }
-    static isBoolean(param) {
-        return typeof param === "boolean";
-    }
-    static isDate(param) {
-        return param instanceof Date;
-    }
-    static isObject(param) {
-        return typeof param == "object";
-    }
-    // poaram >= value
-    static isNotMinSize(param, value) {
-        if (ValidationUtil.isString(param)) {
-            return param.length >= value;
-        }
-        if (ValidationUtil.isNumber(param)) {
-            return param >= value;
-        }
-        if (ValidationUtil.isBoolean(param)) {
-            return true;
-        }
-        let v = ValidationUtil.isNotNull(param) ? param.toString() : "";
-        return v.length >= value;
-    }
-    static isNotMaxSize(param, value) {
-        return !ValidationUtil.isNotMinSize(param, value + 1);
-    }
-    static isArray(param, type) {
-        if (!Array.isArray(param)) {
-            return false;
-        }
-        //修正校验数组的错误
-        if (type.startsWith("array")) {
-            type = type.replace(/array/, "");
-        }
-        let checkFun = this.getCheckFun(type);
-        if (checkFun) {
-            return param.every((item) => {
-                return Reflect.apply(checkFun, ValidationUtil, [item]);
-            });
-        }
-        return true;
-    }
-    static getCheckFun(type) {
-        //判定类型
-        if (type.startsWith("array")) {
-            return ValidationUtil.isArray;
-        }
-        let formatFun = null;
-        switch (type) {
-            case "string": {
-                formatFun = ValidationUtil.isString;
-                break;
-            }
-            case "boolean": {
-                formatFun = ValidationUtil.isBoolean;
-                break;
-            }
-            case "object": {
-                formatFun = ValidationUtil.isObject;
-                break;
-            }
-            case "int":
-            case "float":
-            case "number": {
-                formatFun = ValidationUtil.isNumber;
-                break;
-            }
-            case "date": {
-                formatFun = ValidationUtil.isDate;
-                break;
-            }
-            default: {
-                break;
-            }
-        }
-        return formatFun;
-    }
-    static checkType(param, type) {
-        let formatFun = ValidationUtil.getCheckFun(type);
-        if (!formatFun) {
-            return false;
-        }
-        return Reflect.apply(formatFun, ValidationUtil, [param, type]);
-    }
-}
-exports.default = ValidationUtil;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const TypeUtil_1 = require("./TypeUtil");
+//类型校验器
+class ValidationUtil {
+    //是否为空
+    static isNotNull(param) {
+        if (param != undefined && param != null) {
+            if (TypeUtil_1.default.isString(param)) {
+                return param.length > 0;
+            }
+            if (TypeUtil_1.default.isObject(param)) {
+                if (TypeUtil_1.default.isDate(param) || TypeUtil_1.default.isMap(param) || TypeUtil_1.default.isSet(param)) {
+                    return true;
+                }
+                return Reflect.ownKeys(param).length > 0;
+            }
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    static isNull(param) {
+        return !ValidationUtil.isNotNull(param);
+    }
+    //修改数字的判断方法
+    static isNumber(param) {
+        return !isNaN(param);
+    }
+    static isString(param) {
+        return typeof param === "string";
+    }
+    static isBoolean(param) {
+        return typeof param === "boolean";
+    }
+    static isDate(param) {
+        return param instanceof Date;
+    }
+    static isObject(param) {
+        return typeof param == "object";
+    }
+    // poaram >= value
+    static isNotMinSize(param, value) {
+        if (ValidationUtil.isString(param)) {
+            return param.length >= value;
+        }
+        if (ValidationUtil.isNumber(param)) {
+            return param >= value;
+        }
+        if (ValidationUtil.isBoolean(param)) {
+            return true;
+        }
+        //修正数组的判断
+        if (Array.isArray(param)) {
+            return param.length >= value;
+        }
+        let v = ValidationUtil.isNotNull(param) ? param.toString() : "";
+        return v.length >= value;
+    }
+    static isNotMaxSize(param, value) {
+        return !ValidationUtil.isNotMinSize(param, value + 1);
+    }
+    static isArray(param, type) {
+        if (!Array.isArray(param)) {
+            return false;
+        }
+        //修正校验数组的错误
+        if (type.startsWith("array")) {
+            type = type.replace(/array/, "");
+        }
+        let checkFun = this.getCheckFun(type);
+        if (checkFun) {
+            return param.every((item) => {
+                return Reflect.apply(checkFun, ValidationUtil, [item]);
+            });
+        }
+        return true;
+    }
+    static getCheckFun(type) {
+        //判定类型
+        if (type.startsWith("array")) {
+            return ValidationUtil.isArray;
+        }
+        let formatFun = null;
+        switch (type) {
+            case "string": {
+                formatFun = ValidationUtil.isString;
+                break;
+            }
+            case "boolean": {
+                formatFun = ValidationUtil.isBoolean;
+                break;
+            }
+            case "object": {
+                formatFun = ValidationUtil.isObject;
+                break;
+            }
+            case "int":
+            case "float":
+            case "number": {
+                formatFun = ValidationUtil.isNumber;
+                break;
+            }
+            case "date": {
+                formatFun = ValidationUtil.isDate;
+                break;
+            }
+            default: {
+                break;
+            }
+        }
+        return formatFun;
+    }
+    static checkType(param, type) {
+        let formatFun = ValidationUtil.getCheckFun(type);
+        if (!formatFun) {
+            return false;
+        }
+        return Reflect.apply(formatFun, ValidationUtil, [param, type]);
+    }
+}
+exports.default = ValidationUtil;

package/target/utils.js

@@ -1,25 +1,25 @@
-"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;
-const ClassLoader_1 = require("./utils/ClassLoader");
-exports.ClassLoader = ClassLoader_1.default;
-const ClassUtils_1 = require("./utils/ClassUtils");
-exports.ClassUtils = ClassUtils_1.default;
-const CryptoUtil_1 = require("./utils/CryptoUtil");
-exports.CryptoUtil = CryptoUtil_1.default;
-const DataFormat_1 = require("./utils/DataFormat");
-exports.DataFormat = DataFormat_1.default;
-const DateUtil_1 = require("./utils/DateUtil");
-exports.DateUtil = DateUtil_1.default;
-const FileUtil_1 = require("./utils/FileUtil");
-exports.FileUtil = FileUtil_1.default;
-const FormatStr_1 = require("./utils/FormatStr");
-exports.FormatStr = FormatStr_1.default;
-const Mix_1 = require("./utils/Mix");
-exports.MixTool = Mix_1.default;
-const TypeUtil_1 = require("./utils/TypeUtil");
-exports.TypeUtil = TypeUtil_1.default;
-const ValidationUtil_1 = require("./utils/ValidationUtil");
-exports.ValidationUtil = ValidationUtil_1.default;
-const IPUtils_1 = require("./utils/IPUtils");
-exports.IPUtils = IPUtils_1.default;
+"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;
+const ClassLoader_1 = require("./utils/ClassLoader");
+exports.ClassLoader = ClassLoader_1.default;
+const ClassUtils_1 = require("./utils/ClassUtils");
+exports.ClassUtils = ClassUtils_1.default;
+const CryptoUtil_1 = require("./utils/CryptoUtil");
+exports.CryptoUtil = CryptoUtil_1.default;
+const DataFormat_1 = require("./utils/DataFormat");
+exports.DataFormat = DataFormat_1.default;
+const DateUtil_1 = require("./utils/DateUtil");
+exports.DateUtil = DateUtil_1.default;
+const FileUtil_1 = require("./utils/FileUtil");
+exports.FileUtil = FileUtil_1.default;
+const FormatStr_1 = require("./utils/FormatStr");
+exports.FormatStr = FormatStr_1.default;
+const Mix_1 = require("./utils/Mix");
+exports.MixTool = Mix_1.default;
+const TypeUtil_1 = require("./utils/TypeUtil");
+exports.TypeUtil = TypeUtil_1.default;
+const ValidationUtil_1 = require("./utils/ValidationUtil");
+exports.ValidationUtil = ValidationUtil_1.default;
+const IPUtils_1 = require("./utils/IPUtils");
+exports.IPUtils = IPUtils_1.default;

package/test/unit/decorators-test.ts

@@ -5,7 +5,7 @@ describe("装饰器测试", () => {
 	it("只读装饰器测试", () => {
 		class TestModel {
 			@Readonly
-			info: string;
+			info!: string;
 
 			@Readonly
 			setInfo(s: string) {
@@ -25,13 +25,13 @@ describe("装饰器测试", () => {
 		class TestModel {
 			@Deprecate("hello is Deprecate")
 			async hello() {
-				return new Promise(resolve => {
+				return new Promise((resolve) => {
 					resolve("hello is Deprecate");
 				});
 			}
 		}
 
-		new TestModel().hello().then(res => {
+		new TestModel().hello().then((res) => {
 			console.log(res);
 		});
 	});

package/test/unit/valid-test.ts

@@ -7,66 +7,71 @@ import { ValidationUtil } from "../../src/utils";
 
 describe("表单校验测试", () => {
 	it("表单单个测试", () => {
-		class A {
-			//简单类型
-			@ValidForm
-			test(@Rule() @NotNull a?: string) {
-				console.log(a);
-			}
-		}
-		let instance = new A();
-		instance.test("");
-	});
-
-	it("表单复合型测试", () => {
-		type B = {
-			c: string;
-			d?: number;
-		};
 		class A {
 			//简单类型
 			@ValidForm
 			test(
 				@Rule({
-					a: { required: true },
-				})
-				a: string,
-				@Rule({
-					c: { required: true },
-					d: { type: "number", minSize: 1, maxSize: 10 },
+					a: { required: true, type: "int" },
 				})
-				b: B
+				{ a }: { a: any }
 			) {
-				console.log(a, b);
+				console.log(a);
 			}
 		}
-		let instance = new A();
-		instance.test("a", { c: "c", d: 6 }); // 校验通过
-		instance.test("a", { c: "c", d: 13 }); //校验失败
+		console.log("");
+		new A().test({ a: [] });
 	});
 
-	it("表单类测试", () => {
-		class B {
-			@NotNull
-			c!: string;
+	// it("表单复合型测试", () => {
+	// 	type B = {
+	// 		c: string;
+	// 		d?: number;
+	// 	};
+	// 	class A {
+	// 		//简单类型
+	// 		@ValidForm
+	// 		test(
+	// 			@Rule({
+	// 				a: { required: true },
+	// 			})
+	// 			a: string,
+	// 			@Rule({
+	// 				c: { required: true },
+	// 				d: { type: "number", minSize: 1, maxSize: 10 },
+	// 			})
+	// 			b: B
+	// 		) {
+	// 			console.log(a, b);
+	// 		}
+	// 	}
+	// 	let instance = new A();
+	// 	instance.test("a", { c: "c", d: 6 }); // 校验通过
+	// 	instance.test("a", { c: "c", d: 13 }); //校验失败
+	// });
 
-			@Size({ minSize: 1, maxSize: 10 })
-			d?: number;
-		}
-		class A {
-			//简单类型
-			@ValidForm
-			test(a: string, @Rule() @NotNull b: B) {
-				console.log(a, b);
-			}
-		}
-		let instance = new A();
-		instance.test("a", { c: "c", d: 13 }); //校验失败
-	});
+	// it("表单类测试", () => {
+	// 	class B {
+	// 		@NotNull
+	// 		c!: string;
 
-	it("测试map是否为空", () => {
-		let d = new Map();
-		d.set("hello", "world");
-		console.log(ValidationUtil.isNotNull(d) == true);
-	});
+	// 		@Size({ minSize: 1, maxSize: 10 })
+	// 		d?: number;
+	// 	}
+	// 	class A {
+	// 		//简单类型
+	// 		@ValidForm
+	// 		test(a: string, @Rule() @NotNull b: B) {
+	// 			console.log(a, b);
+	// 		}
+	// 	}
+	// 	let instance = new A();
+	// 	instance.test("a", { c: "c", d: 13 }); //校验失败
+	// });
+
+	// it("测试map是否为空", () => {
+	// 	let d = new Map();
+	// 	d.set("hello", "world");
+	// 	console.log(ValidationUtil.isNotNull(d) == true);
+	// });
 });

package/test/unit/logs/sys.log

@@ -1,24 +0,0 @@
-{"timestamp":"2022-09-09 10:58:51.75","level":"INFO","label":"sys","message":"Start scanning component"}
-{"timestamp":"2022-09-09 10:58:51.78","level":"INFO","label":"sys","message":"Complete component scan"}
-{"timestamp":"2022-09-09 10:58:51.78","level":"INFO","label":"sys","message":"Call application initialization method"}
-{"timestamp":"2022-09-09 10:58:51.80","level":"INFO","label":"sys","message":"start server app is run"}
-{"timestamp":"2022-09-09 10:58:51.81","level":"INFO","label":"sys","message":"version 1.0.0"}
-{"timestamp":"2022-09-09 10:58:51.84","level":"INFO","label":"sys","message":"exit reason","splat":"[\"beforeExit exit\"]"}
-{"timestamp":"2022-09-09 11:11:48.302","level":"INFO","label":"sys","message":"Start scanning component"}
-{"timestamp":"2022-09-09 11:11:48.305","level":"INFO","label":"sys","message":"Complete component scan"}
-{"timestamp":"2022-09-09 11:11:48.306","level":"INFO","label":"sys","message":"Call application initialization method"}
-{"timestamp":"2022-09-09 11:11:48.308","level":"INFO","label":"sys","message":"start server app is run"}
-{"timestamp":"2022-09-09 11:11:48.309","level":"INFO","label":"sys","message":"version 1.0.0"}
-{"timestamp":"2022-09-09 11:11:48.322","level":"INFO","label":"sys","message":"exit reason","splat":"[\"beforeExit exit\"]"}
-{"timestamp":"2022-09-09 11:12:01.418","level":"INFO","label":"sys","message":"Start scanning component"}
-{"timestamp":"2022-09-09 11:12:01.421","level":"INFO","label":"sys","message":"Complete component scan"}
-{"timestamp":"2022-09-09 11:12:01.422","level":"INFO","label":"sys","message":"Call application initialization method"}
-{"timestamp":"2022-09-09 11:12:01.424","level":"INFO","label":"sys","message":"start server app is run"}
-{"timestamp":"2022-09-09 11:12:01.424","level":"INFO","label":"sys","message":"version 1.0.0"}
-{"timestamp":"2022-09-09 11:12:01.427","level":"INFO","label":"sys","message":"exit reason","splat":"[\"beforeExit exit\"]"}
-{"timestamp":"2022-09-09 11:17:03.161","level":"INFO","label":"sys","message":"Start scanning component"}
-{"timestamp":"2022-09-09 11:17:03.164","level":"INFO","label":"sys","message":"Complete component scan"}
-{"timestamp":"2022-09-09 11:17:03.905","level":"INFO","label":"sys","message":"Call application initialization method"}
-{"timestamp":"2022-09-09 11:17:03.907","level":"INFO","label":"sys","message":"start server app is run"}
-{"timestamp":"2022-09-09 11:17:03.908","level":"INFO","label":"sys","message":"version 1.0.0"}
-{"timestamp":"2022-09-09 11:17:03.911","level":"INFO","label":"sys","message":"exit reason","splat":"[\"beforeExit exit\"]"}