@fastcar/core 0.2.59 → 0.2.61

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@fastcar/core",
-	"version": "0.2.59",
+	"version": "0.2.61",
 	"homepage": "https://github.com/williamDazhangyu/fast-car",
 	"main": "target/index.js",
 	"author": "william_zhong",
@@ -38,10 +38,8 @@
 	},
 	"devDependencies": {
 		"@types/mocha": "^9.0.0",
-		"@types/node": "^16.11.7",
 		"@types/reflect-metadata": "^0.1.0",
-		"@types/yaml": "^1.9.7",
-		"typescript": "^4.4.2"
+		"@types/yaml": "^1.9.7"
 	},
 	"repository": {
 		"type": "git",

package/src/db.ts

@@ -23,6 +23,7 @@ export enum OperatorEnum {
 export enum JoinEnum {
 	and = "AND",
 	or = "OR",
+	not = "NOT",
 }
 
 export enum OrderEnum {

package/src/model/WinstonLogger.ts

@@ -50,7 +50,7 @@ export default class WinstonLogger {
 		let newLogger = winston.loggers.add(category, {
 			format: winston.format.combine(
 				winston.format.label({ label: category }),
-				winston.format.printf(info => {
+				winston.format.printf((info) => {
 					//debug模式等级时仅为控制台输出
 					let level = info.level.toUpperCase();
 					let timestamp = DateUtil.toDateTimeMS();
@@ -63,7 +63,8 @@ export default class WinstonLogger {
 					};
 
 					if (Reflect.has(info, SPLAT)) {
-						Reflect.set(content, "splat", JSON.stringify(Reflect.get(info, SPLAT)));
+						let splat = Reflect.get(info, SPLAT);
+						Reflect.set(content, "splat", typeof splat == "string" ? splat : JSON.stringify(splat));
 					}
 
 					if (info.stack) {
@@ -79,7 +80,7 @@ export default class WinstonLogger {
 
 						if (Reflect.has(info, SPLAT)) {
 							let splatMsg: any[] = Reflect.get(info, SPLAT);
-							splatMsg.forEach(item => {
+							splatMsg.forEach((item) => {
 								text += " " + this.colorizeData(item);
 							});
 						}

package/src/utils/ClassLoader.ts

@@ -59,7 +59,7 @@ export default class ClassLoader {
 		//添加热更方法
 		fs.watch(fp, function (event, filename) {
 			if (event === "change") {
-				if (!fileFlag) {
+				if (!fileFlag && filename) {
 					context.emit(eventName, path.join(fp, filename));
 				} else {
 					context.emit(eventName, fp);

package/src/utils/ValidationUtil.ts

@@ -1,5 +1,8 @@
 import { DataTypes } from "../constant/DataTypes";
 import TypeUtil from "./TypeUtil";
+
+const NumberRegex = /^[0-9]+$/;
+
 //类型校验器
 export default class ValidationUtil {
 	//是否为空
@@ -27,8 +30,9 @@ export default class ValidationUtil {
 		return !ValidationUtil.isNotNull(param);
 	}
 
+	//修改数字的判断方法
 	static isNumber(param: any): boolean {
-		return typeof param === "number" && !isNaN(param);
+		return NumberRegex.test(param);
 	}
 
 	static isString(param: any): boolean {
@@ -61,6 +65,11 @@ export default class ValidationUtil {
 			return true;
 		}
 
+		//修正数组的判断
+		if (Array.isArray(param)) {
+			return param.length >= value;
+		}
+
 		let v = ValidationUtil.isNotNull(param) ? param.toString() : "";
 		return v.length >= value;
 	}