@fastcar/core 0.2.46 → 0.2.48

package/package.json

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

package/src/FastCarApplication.ts

@@ -3,7 +3,7 @@ import * as fs from "fs";
 import * as process from "process";
 import * as Events from "events";
 import * as path from "path";
-import ClassLoader from "./utils/classLoader";
+import ClassLoader from "./utils/ClassLoader";
 import FileUtil from "./utils/FileUtil";
 import MixTool from "./utils/Mix";
 import TypeUtil from "./utils/TypeUtil";

package/src/utils/TypeUtil.ts

@@ -53,4 +53,12 @@ export default class TypeUtil {
 		let fname = name.toLowerCase();
 		return BasicTypes.includes(fname);
 	}
+
+	static isMap(value: any) {
+		return value instanceof Map;
+	}
+
+	static isSet(value: any) {
+		return value instanceof Set;
+	}
 }

package/src/utils/ValidationUtil.ts

@@ -10,9 +10,10 @@ export default class ValidationUtil {
 			}
 
 			if (TypeUtil.isObject(param)) {
-				if (TypeUtil.isDate(param)) {
+				if (TypeUtil.isDate(param) || TypeUtil.isMap(param) || TypeUtil.isSet(param)) {
 					return true;
 				}
+
 				return Reflect.ownKeys(param).length > 0;
 			}
 

package/target/FastCarApplication.js

@@ -15,7 +15,7 @@ const fs = require("fs");
 const process = require("process");
 const Events = require("events");
 const path = require("path");
-const classLoader_1 = require("./utils/classLoader");
+const ClassLoader_1 = require("./utils/ClassLoader");
 const FileUtil_1 = require("./utils/FileUtil");
 const Mix_1 = require("./utils/Mix");
 const TypeUtil_1 = require("./utils/TypeUtil");
@@ -99,7 +99,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
         this.delayHotIds.forEach(({ fp, loadType }) => {
             switch (loadType) {
                 case 1: {
-                    let moduleClass = classLoader_1.default.loadModule(fp, true);
+                    let moduleClass = ClassLoader_1.default.loadModule(fp, true);
                     this.sysLogger.info("hot update---" + fp);
                     if (moduleClass != null) {
                         moduleClass.forEach((func) => {
@@ -245,7 +245,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
             if (f.startsWith(resp)) {
                 continue;
             }
-            let moduleClass = classLoader_1.default.loadModule(f);
+            let moduleClass = ClassLoader_1.default.loadModule(f);
             if (moduleClass != null) {
                 moduleClass.forEach((func, name) => {
                     if (this.componentMap.has(name)) {
@@ -337,7 +337,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
                 };
                 if (!fpObj) {
                     fpObj = [fpdesc];
-                    classLoader_1.default.watchServices(fp, this);
+                    ClassLoader_1.default.watchServices(fp, this);
                     this.watchFiles.set(fp, fpObj);
                 }
                 else {
@@ -549,7 +549,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
         this.loadSysConfig();
         //监听系统配置
         if (this.isHotterSysConfig()) {
-            classLoader_1.default.watchServices(this.getResourcePath(), this, "sysReload");
+            ClassLoader_1.default.watchServices(this.getResourcePath(), this, "sysReload");
         }
         //开启日志
         this.startLog();

package/target/utils/TypeUtil.js

@@ -43,5 +43,11 @@ class TypeUtil {
         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

@@ -10,7 +10,7 @@ class ValidationUtil {
                 return param.length > 0;
             }
             if (TypeUtil_1.default.isObject(param)) {
-                if (TypeUtil_1.default.isDate(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;

package/test/unit/valid-test.ts

@@ -3,6 +3,7 @@ import ValidForm from "../../src/annotation/valid/ValidForm";
 import NotNull from "../../src/annotation/valid/NotNull";
 import Size from "../../src/annotation/valid/Size";
 import { Rule } from "../../src/annotation/valid/Rule";
+import { ValidationUtil } from "../../src/utils";
 
 describe("表单校验测试", () => {
 	it("表单单个测试", () => {
@@ -62,4 +63,10 @@ describe("表单校验测试", () => {
 		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/utils.d.ts

@@ -94,6 +94,10 @@ export class TypeUtil {
 
 	//是否为基本类型
 	static isBasic(name: string): boolean;
+
+	static isMap(value: any): boolean;
+
+	static isSet(value: any): boolean;
 }
 
 export class ValidationUtil {