@fastcar/core 0.2.63 → 0.3.0

package/target/annotation/valid/Rule.js

@@ -1,100 +1,99 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Rule = void 0;
-require("reflect-metadata");
-const FastCarMetaData_1 = require("../../constant/FastCarMetaData");
-const TypeUtil_1 = require("../../utils/TypeUtil");
-function Rule(rules = {}) {
-    return function (target, method, index) {
-        //获取设计类型
-        //获取增强类型的增加严格校验
-        let paramsTypes = Reflect.getMetadata(FastCarMetaData_1.FastCarMetaData.paramTypes, target, method);
-        //对rules进行进一步的补充
-        let designObj = paramsTypes[index];
-        let basicFlag = false;
-        if (!designObj) {
-            console.warn(`Design type not found by ${method} in ${index}`);
-        }
-        else {
-            basicFlag = TypeUtil_1.default.isBasic(designObj.name);
-            //获取表单类型
-            let childMap = Reflect.getMetadata(FastCarMetaData_1.FastCarMetaData.ValidChildFormRules, target, `${method}-${index}`);
-            //进行合并添加
-            if (TypeUtil_1.default.isClass(designObj)) {
-                let appendMap = Reflect.getMetadata(FastCarMetaData_1.FastCarMetaData.ValidChildFormRules, designObj.prototype);
-                if (appendMap) {
-                    if (!childMap) {
-                        childMap = new Map();
-                    }
-                    appendMap.forEach((v, key) => {
-                        if (!childMap.has(key)) {
-                            childMap.set(key, v);
-                            return;
-                        }
-                        else {
-                            //进行覆盖更新
-                            let item = childMap.get(key);
-                            if (Reflect.has(v, "filters")) {
-                                if (Array.isArray(item?.filters)) {
-                                    v.filters?.forEach(f => {
-                                        item?.filters?.push(f);
-                                    });
-                                }
-                            }
-                            //合并所有属性
-                            item = Object.assign(v, item);
-                            childMap.set(key, item);
-                        }
-                    });
-                }
-            }
-            if (childMap && childMap.size > 0) {
-                //补充表单
-                childMap.forEach((citem, prop) => {
-                    if (Reflect.has(rules, prop)) {
-                        //优先取表单里的
-                        rules[prop] = Object.assign(citem, rules[prop]);
-                    }
-                    else {
-                        Reflect.set(rules, prop, citem);
-                    }
-                });
-            }
-        }
-        let rulesMap = Reflect.getMetadata(FastCarMetaData_1.FastCarMetaData.ValidFormRules, target, method);
-        if (!rulesMap) {
-            rulesMap = new Map();
-            Reflect.defineMetadata(FastCarMetaData_1.FastCarMetaData.ValidFormRules, rulesMap, target, method);
-        }
-        //补全消息
-        Object.keys(rules).forEach(prop => {
-            let r = rules[prop];
-            //根据增强型补全type
-            if (basicFlag && !Reflect.has(r, "type")) {
-                if (designObj) {
-                    r.type = designObj.name.toLowerCase();
-                }
-                else {
-                    r.type = "string";
-                }
-            }
-            if (r.message) {
-                if (r.required) {
-                    r.nullMessage = r.nullMessage ? r.nullMessage : r.message;
-                }
-                if (r.maxSize || r.minSize) {
-                    r.sizeMessgae = r.sizeMessgae ? r.sizeMessgae : r.message;
-                }
-                r.typeMessage = r.typeMessage ? r.typeMessage : r.message;
-            }
-            else {
-                if (r.required) {
-                    r.nullMessage = `${prop} is required`;
-                }
-                r.typeMessage = `${prop} type is ${r.type}`;
-            }
-        });
-        rulesMap.set(index, { rules, basicFlag, index });
-    };
-}
-exports.Rule = Rule;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Rule = Rule;
+require("reflect-metadata");
+const FastCarMetaData_1 = require("../../constant/FastCarMetaData");
+const TypeUtil_1 = require("../../utils/TypeUtil");
+function Rule(rules = {}) {
+    return function (target, method, index) {
+        //获取设计类型
+        //获取增强类型的增加严格校验
+        let paramsTypes = Reflect.getMetadata(FastCarMetaData_1.FastCarMetaData.paramTypes, target, method);
+        //对rules进行进一步的补充
+        let designObj = paramsTypes[index];
+        let basicFlag = false;
+        if (!designObj) {
+            console.warn(`Design type not found by ${method} in ${index}`);
+        }
+        else {
+            basicFlag = TypeUtil_1.default.isBasic(designObj.name);
+            //获取表单类型
+            let childMap = Reflect.getMetadata(FastCarMetaData_1.FastCarMetaData.ValidChildFormRules, target, `${method}-${index}`);
+            //进行合并添加
+            if (TypeUtil_1.default.isClass(designObj)) {
+                let appendMap = Reflect.getMetadata(FastCarMetaData_1.FastCarMetaData.ValidChildFormRules, designObj.prototype);
+                if (appendMap) {
+                    if (!childMap) {
+                        childMap = new Map();
+                    }
+                    appendMap.forEach((v, key) => {
+                        if (!childMap.has(key)) {
+                            childMap.set(key, v);
+                            return;
+                        }
+                        else {
+                            //进行覆盖更新
+                            let item = childMap.get(key);
+                            if (Reflect.has(v, "filters")) {
+                                if (Array.isArray(item?.filters)) {
+                                    v.filters?.forEach(f => {
+                                        item?.filters?.push(f);
+                                    });
+                                }
+                            }
+                            //合并所有属性
+                            item = Object.assign(v, item);
+                            childMap.set(key, item);
+                        }
+                    });
+                }
+            }
+            if (childMap && childMap.size > 0) {
+                //补充表单
+                childMap.forEach((citem, prop) => {
+                    if (Reflect.has(rules, prop)) {
+                        //优先取表单里的
+                        rules[prop] = Object.assign(citem, rules[prop]);
+                    }
+                    else {
+                        Reflect.set(rules, prop, citem);
+                    }
+                });
+            }
+        }
+        let rulesMap = Reflect.getMetadata(FastCarMetaData_1.FastCarMetaData.ValidFormRules, target, method);
+        if (!rulesMap) {
+            rulesMap = new Map();
+            Reflect.defineMetadata(FastCarMetaData_1.FastCarMetaData.ValidFormRules, rulesMap, target, method);
+        }
+        //补全消息
+        Object.keys(rules).forEach(prop => {
+            let r = rules[prop];
+            //根据增强型补全type
+            if (basicFlag && !Reflect.has(r, "type")) {
+                if (designObj) {
+                    r.type = designObj.name.toLowerCase();
+                }
+                else {
+                    r.type = "string";
+                }
+            }
+            if (r.message) {
+                if (r.required) {
+                    r.nullMessage = r.nullMessage ? r.nullMessage : r.message;
+                }
+                if (r.maxSize || r.minSize) {
+                    r.sizeMessgae = r.sizeMessgae ? r.sizeMessgae : r.message;
+                }
+                r.typeMessage = r.typeMessage ? r.typeMessage : r.message;
+            }
+            else {
+                if (r.required) {
+                    r.nullMessage = `${prop} is required`;
+                }
+                r.typeMessage = `${prop} type is ${r.type}`;
+            }
+        });
+        rulesMap.set(index, { rules, basicFlag, index });
+    };
+}

package/target/annotation/valid/Size.js

@@ -1,10 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const AddChildValid_1 = require("./AddChildValid");
-//校验长度
-function Size(m = { minSize: 0, maxSize: 0 }) {
-    return function (target, propertyKey, index) {
-        (0, AddChildValid_1.default)(target, propertyKey, m, index);
-    };
-}
-exports.default = Size;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = Size;
+const AddChildValid_1 = require("./AddChildValid");
+//校验长度
+function Size(m = { minSize: 0, maxSize: 0 }) {
+    return function (target, propertyKey, index) {
+        (0, AddChildValid_1.default)(target, propertyKey, m, index);
+    };
+}

package/target/annotation/valid/Type.js

@@ -1,10 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const AddChildValid_1 = require("./AddChildValid");
-//表明类型
-function Type(type) {
-    return function (target, propertyKey, index) {
-        (0, AddChildValid_1.default)(target, propertyKey, { type: type.toLowerCase() }, index);
-    };
-}
-exports.default = Type;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = Type;
+const AddChildValid_1 = require("./AddChildValid");
+//表明类型
+function Type(type) {
+    return function (target, propertyKey, index) {
+        (0, AddChildValid_1.default)(target, propertyKey, { type: type.toLowerCase() }, index);
+    };
+}

package/target/annotation/valid/ValidCustom.js

@@ -1,17 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const AddChildValid_1 = require("./AddChildValid");
-//自定义表单校验
-function ValidCustom(fn, message) {
-    return function (target, propertyKey, index) {
-        (0, AddChildValid_1.default)(target, propertyKey, {
-            filters: [
-                {
-                    fn,
-                    message,
-                },
-            ],
-        }, index);
-    };
-}
-exports.default = ValidCustom;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = ValidCustom;
+const AddChildValid_1 = require("./AddChildValid");
+//自定义表单校验
+function ValidCustom(fn, message) {
+    return function (target, propertyKey, index) {
+        (0, AddChildValid_1.default)(target, propertyKey, {
+            filters: [
+                {
+                    fn,
+                    message,
+                },
+            ],
+        }, index);
+    };
+}

package/target/annotation/valid/ValidForm.js

@@ -1,133 +1,133 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const ValidError_1 = require("../../model/ValidError");
-const utils_1 = require("../../utils");
-const ValidationUtil_1 = require("../../utils/ValidationUtil");
-const DataFormat_1 = require("../../utils/DataFormat");
-const FastCarMetaData_1 = require("../../constant/FastCarMetaData");
-function throwErrMsg(rule, prop, msg) {
-    let showMsg = msg;
-    if (!showMsg) {
-        showMsg = rule.message ? rule.message : `The ${prop} parameter is invalid `;
-    }
-    throw new ValidError_1.default(showMsg);
-}
-function getFormValue(value, prop, defaultValue) {
-    //查看是否校验子属性
-    if (ValidationUtil_1.default.isNotNull(value)) {
-        if (utils_1.TypeUtil.isObject(value)) {
-            if (Reflect.has(value, prop)) {
-                let propValue = Reflect.get(value, prop);
-                if (ValidationUtil_1.default.isNotNull(propValue)) {
-                    return propValue;
-                }
-            }
-        }
-        else {
-            return value;
-        }
-    }
-    if (ValidationUtil_1.default.isNotNull(defaultValue)) {
-        return defaultValue;
-    }
-    return null;
-}
-function setFormValue(obj, prop, val) {
-    //查看是否校验子属性
-    if (ValidationUtil_1.default.isNotNull(obj) || utils_1.TypeUtil.isObject(obj)) {
-        //修正为{}对象时无法赋值错误
-        if (utils_1.TypeUtil.isObject(obj)) {
-            Reflect.set(obj, prop, val);
-        }
-        else {
-            obj = val;
-        }
-    }
-    return obj;
-}
-function delFormValue(value, prop) {
-    if (ValidationUtil_1.default.isNotNull(value)) {
-        if (utils_1.TypeUtil.isObject(value)) {
-            if (Reflect.has(value, prop)) {
-                Reflect.deleteProperty(value, prop);
-            }
-        }
-    }
-}
-/***
- * @version 1.0 校验表单 支持校验大小 类型 和自定义方法
- * @param rules key - value的形式 通常一个参数一个校验方式
- * @param paramIndex 位于第几个参数的校验表单
- *
- */
-function ValidForm(target, methodName, descriptor) {
-    let next = descriptor.value;
-    descriptor.value = function (...args) {
-        let rulesMap = Reflect.getMetadata(FastCarMetaData_1.FastCarMetaData.ValidFormRules, target, methodName);
-        if (rulesMap && rulesMap.size > 0) {
-            rulesMap.forEach((item, paramIndex) => {
-                let { rules, basicFlag } = item;
-                let currObj = args[paramIndex];
-                if (ValidationUtil_1.default.isNull(currObj)) {
-                    currObj = basicFlag ? "" : {};
-                }
-                for (let prop in rules) {
-                    let rule = rules[prop];
-                    //进行取值
-                    let val = getFormValue(currObj, prop, rule.defaultVal);
-                    //判断关键字是否相同
-                    if (`${methodName}-${paramIndex}` == prop) {
-                        val = currObj || rule.defaultVal;
-                    }
-                    //优先判断是否为必填项
-                    if (ValidationUtil_1.default.isNull(val)) {
-                        if (rule.required) {
-                            throwErrMsg(rule, prop, rule.nullMessage);
-                        }
-                        else {
-                            if (utils_1.TypeUtil.isObject(currObj) && !Reflect.has(currObj, prop)) {
-                                delFormValue(currObj, prop);
-                            }
-                        }
-                    }
-                    else {
-                        //进行类型判断并赋值
-                        let checkType = rule.type || "string";
-                        val = DataFormat_1.default.formatValue(val, checkType);
-                        //调用check的方法
-                        if (!ValidationUtil_1.default.checkType(val, checkType)) {
-                            throwErrMsg(rule, prop, rule.typeMessage);
-                        }
-                        //判断长度
-                        if (rule?.minSize) {
-                            if (!ValidationUtil_1.default.isNotMinSize(val, rule.minSize)) {
-                                throwErrMsg(rule, prop, rule.sizeMessgae ? rule.sizeMessgae : `${prop} should be greater than ${rule.minSize} `);
-                            }
-                        }
-                        if (rule?.maxSize) {
-                            if (!ValidationUtil_1.default.isNotMaxSize(val, rule.maxSize)) {
-                                throwErrMsg(rule, prop, rule.sizeMessgae ? rule.sizeMessgae : `${prop} should be less than ${rule.maxSize} `);
-                            }
-                        }
-                        //自定义方法校验
-                        if (Array.isArray(rule.filters)) {
-                            for (let fnItem of rule.filters) {
-                                let fn = fnItem.fn;
-                                let flag = Reflect.apply(fn, this, [val]);
-                                if (!flag) {
-                                    //抛出错误提示
-                                    throwErrMsg(rule, prop, fnItem.message || rule.message);
-                                }
-                            }
-                        }
-                        //进行赋值
-                        currObj = setFormValue(currObj, prop, val);
-                    }
-                }
-                args[paramIndex] = currObj;
-            });
-        }
-        return Reflect.apply(next, this, args);
-    };
-}
-exports.default = ValidForm;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = ValidForm;
+const ValidError_1 = require("../../model/ValidError");
+const utils_1 = require("../../utils");
+const ValidationUtil_1 = require("../../utils/ValidationUtil");
+const DataFormat_1 = require("../../utils/DataFormat");
+const FastCarMetaData_1 = require("../../constant/FastCarMetaData");
+function throwErrMsg(rule, prop, msg) {
+    let showMsg = msg;
+    if (!showMsg) {
+        showMsg = rule.message ? rule.message : `The ${prop} parameter is invalid `;
+    }
+    throw new ValidError_1.default(showMsg);
+}
+function getFormValue(value, prop, defaultValue) {
+    //查看是否校验子属性
+    if (ValidationUtil_1.default.isNotNull(value)) {
+        if (utils_1.TypeUtil.isObject(value)) {
+            if (Reflect.has(value, prop)) {
+                let propValue = Reflect.get(value, prop);
+                if (ValidationUtil_1.default.isNotNull(propValue)) {
+                    return propValue;
+                }
+            }
+        }
+        else {
+            return value;
+        }
+    }
+    if (ValidationUtil_1.default.isNotNull(defaultValue)) {
+        return defaultValue;
+    }
+    return null;
+}
+function setFormValue(obj, prop, val) {
+    //查看是否校验子属性
+    if (ValidationUtil_1.default.isNotNull(obj) || utils_1.TypeUtil.isObject(obj)) {
+        //修正为{}对象时无法赋值错误
+        if (utils_1.TypeUtil.isObject(obj)) {
+            Reflect.set(obj, prop, val);
+        }
+        else {
+            obj = val;
+        }
+    }
+    return obj;
+}
+function delFormValue(value, prop) {
+    if (ValidationUtil_1.default.isNotNull(value)) {
+        if (utils_1.TypeUtil.isObject(value)) {
+            if (Reflect.has(value, prop)) {
+                Reflect.deleteProperty(value, prop);
+            }
+        }
+    }
+}
+/***
+ * @version 1.0 校验表单 支持校验大小 类型 和自定义方法
+ * @param rules key - value的形式 通常一个参数一个校验方式
+ * @param paramIndex 位于第几个参数的校验表单
+ *
+ */
+function ValidForm(target, methodName, descriptor) {
+    let next = descriptor.value;
+    descriptor.value = function (...args) {
+        let rulesMap = Reflect.getMetadata(FastCarMetaData_1.FastCarMetaData.ValidFormRules, target, methodName);
+        if (rulesMap && rulesMap.size > 0) {
+            rulesMap.forEach((item, paramIndex) => {
+                let { rules, basicFlag } = item;
+                let currObj = args[paramIndex];
+                if (ValidationUtil_1.default.isNull(currObj)) {
+                    currObj = basicFlag ? "" : {};
+                }
+                for (let prop in rules) {
+                    let rule = rules[prop];
+                    //进行取值
+                    let val = getFormValue(currObj, prop, rule.defaultVal);
+                    //判断关键字是否相同
+                    if (`${methodName}-${paramIndex}` == prop) {
+                        val = currObj || rule.defaultVal;
+                    }
+                    //优先判断是否为必填项
+                    if (ValidationUtil_1.default.isNull(val)) {
+                        if (rule.required) {
+                            throwErrMsg(rule, prop, rule.nullMessage);
+                        }
+                        else {
+                            if (utils_1.TypeUtil.isObject(currObj) && !Reflect.has(currObj, prop)) {
+                                delFormValue(currObj, prop);
+                            }
+                        }
+                    }
+                    else {
+                        //进行类型判断并赋值
+                        let checkType = rule.type || "string";
+                        val = DataFormat_1.default.formatValue(val, checkType);
+                        //调用check的方法
+                        if (!ValidationUtil_1.default.checkType(val, checkType)) {
+                            throwErrMsg(rule, prop, rule.typeMessage);
+                        }
+                        //判断长度
+                        if (rule?.minSize) {
+                            if (!ValidationUtil_1.default.isNotMinSize(val, rule.minSize)) {
+                                throwErrMsg(rule, prop, rule.sizeMessgae ? rule.sizeMessgae : `${prop} should be greater than ${rule.minSize} `);
+                            }
+                        }
+                        if (rule?.maxSize) {
+                            if (!ValidationUtil_1.default.isNotMaxSize(val, rule.maxSize)) {
+                                throwErrMsg(rule, prop, rule.sizeMessgae ? rule.sizeMessgae : `${prop} should be less than ${rule.maxSize} `);
+                            }
+                        }
+                        //自定义方法校验
+                        if (Array.isArray(rule.filters)) {
+                            for (let fnItem of rule.filters) {
+                                let fn = fnItem.fn;
+                                let flag = Reflect.apply(fn, this, [val]);
+                                if (!flag) {
+                                    //抛出错误提示
+                                    throwErrMsg(rule, prop, fnItem.message || rule.message);
+                                }
+                            }
+                        }
+                        //进行赋值
+                        currObj = setFormValue(currObj, prop, val);
+                    }
+                }
+                args[paramIndex] = currObj;
+            });
+        }
+        return Reflect.apply(next, this, args);
+    };
+}