rxtutils 1.1.2-beta.1 → 1.1.2-beta.3

package/dist/cjs/index.cjs

@@ -4,6 +4,8 @@ var index = require('./cache/index.cjs');
 var index$1 = require('./request/index.cjs');
 var index$3 = require('./store/createGetter/index.cjs');
 var index$2 = require('./store/createStateStore/index.cjs');
+var validator = require('./validator/validator.cjs');
+var decorators = require('./validator/decorators.cjs');
 
 
 
@@ -12,3 +14,15 @@ exports.createBaseRequest = index$1;
 exports.createStoreGetter = index$3.createStoreGetter;
 exports.createStoreGetterMemo = index$3.createStoreGetterMemo;
 exports.createStateStore = index$2.default;
+exports.BaseValidator = validator.BaseValidator;
+exports.VArray = decorators.VArray;
+exports.VBoolean = decorators.VBoolean;
+exports.VEmail = decorators.VEmail;
+exports.VMax = decorators.VMax;
+exports.VMaxLength = decorators.VMaxLength;
+exports.VMin = decorators.VMin;
+exports.VMinLength = decorators.VMinLength;
+exports.VNumber = decorators.VNumber;
+exports.VPattern = decorators.VPattern;
+exports.VRequired = decorators.VRequired;
+exports.VString = decorators.VString;

package/dist/cjs/request/index.cjs

@@ -38,7 +38,7 @@ function createBaseRequest(baseOptions) {
             if (method.toLowerCase() === 'post') {
                 requestDataOrParams = data;
             }
-            var _d = tslib.__assign(tslib.__assign(tslib.__assign({}, baseOptions), createOptions), options).defaultMessageShower, defaultMessageShower = _d === void 0 ? alert : _d;
+            var _d = tslib.__assign(tslib.__assign(tslib.__assign({}, baseOptions), createOptions), options).defaultMessageShower, defaultMessageShower = _d === void 0 ? console.error : _d;
             var _e = tslib.__assign(tslib.__assign(tslib.__assign({}, baseOptions), createOptions), options), _f = _e.enableCache, enableCache = _f === void 0 ? false : _f, _g = _e.cacheData, cacheData = _g === void 0 ? false : _g, _h = _e.defaultErrorCodeHandler, defaultErrorCodeHandler = _h === void 0 ? defaultHandlers._defaultErrorCodeHandler.bind(null, defaultMessageShower) : _h, _j = _e.defaultHttpErrorCodeHandler, defaultHttpErrorCodeHandler = _j === void 0 ? defaultHandlers._defaultHttpErrorCodeHandler.bind(null, defaultMessageShower) : _j, _k = _e.otherErrorHandler, otherErrorHandler = _k === void 0 ? defaultHandlers._defaultOtherErrorCodeHandler.bind(null, defaultMessageShower) : _k, _l = _e.errorCodePath, errorCodePath = _l === void 0 ? 'code' : _l, _m = _e.cacheTime, cacheTime = _m === void 0 ? 60 : _m, _o = _e.errorCodeMap, errorCodeMap = _o === void 0 ? {} : _o, _p = _e.successCodes, successCodes = _p === void 0 ? ['0', '200'] : _p, _q = _e.httpErrorCodeMap, httpErrorCodeMap = _q === void 0 ? {} : _q, _r = _e.axiosOptions, axiosOptions = _r === void 0 ? {} : _r, _s = _e.throwError, throwError = _s === void 0 ? true : _s;
             if (enableCache) {
                 var cacheItem = cache.getCache(requestDataOrParams);

package/dist/cjs/validator/decorators.cjs

@@ -0,0 +1,104 @@
+'use strict';
+
+var validator = require('./validator.cjs');
+
+function VRequired(noneVals) {
+    if (noneVals === void 0) { noneVals = [undefined]; }
+    return validator.BaseValidator.decoratorCreator(function (val) {
+        if (noneVals.includes(val)) {
+            return false;
+        }
+        return true;
+    });
+}
+var VString = validator.BaseValidator.decoratorCreator(function (val) {
+    if (typeof val !== 'string') {
+        return false;
+    }
+    return true;
+});
+var VNumber = validator.BaseValidator.decoratorCreator(function (val) {
+    if (typeof val !== 'number') {
+        return false;
+    }
+    return true;
+});
+var VArray = validator.BaseValidator.decoratorCreator(function (val) {
+    if (!Array.isArray(val)) {
+        return false;
+    }
+    return true;
+});
+// 常用校验装饰器
+var VBoolean = validator.BaseValidator.decoratorCreator(function (val) {
+    if (typeof val !== 'boolean') {
+        return false;
+    }
+    return true;
+});
+var VMin = function (min) {
+    return validator.BaseValidator.decoratorCreator(function (val) {
+        if (typeof val !== 'number' || val < min) {
+            return false;
+        }
+        return true;
+    });
+};
+var VMax = function (max) {
+    return validator.BaseValidator.decoratorCreator(function (val) {
+        if (typeof val !== 'number' || val > max) {
+            return false;
+        }
+        return true;
+    });
+};
+var VMinLength = function (minLen) {
+    return validator.BaseValidator.decoratorCreator(function (val) {
+        if (typeof val !== 'string' && !Array.isArray(val)) {
+            return false;
+        }
+        if (val.length < minLen) {
+            return false;
+        }
+        return true;
+    });
+};
+var VMaxLength = function (maxLen) {
+    return validator.BaseValidator.decoratorCreator(function (val) {
+        if (typeof val !== 'string' && !Array.isArray(val)) {
+            return false;
+        }
+        if (val.length > maxLen) {
+            return false;
+        }
+        return true;
+    });
+};
+var VEmail = validator.BaseValidator.decoratorCreator(function (val) {
+    if (typeof val !== 'string') {
+        return false;
+    }
+    // 简单邮箱正则
+    var emailReg = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    return emailReg.test(val);
+});
+var VPattern = function (pattern) {
+    return validator.BaseValidator.decoratorCreator(function (val) {
+        if (typeof val !== 'string') {
+            return false;
+        }
+        return pattern.test(val);
+    });
+};
+
+exports.VArray = VArray;
+exports.VBoolean = VBoolean;
+exports.VEmail = VEmail;
+exports.VMax = VMax;
+exports.VMaxLength = VMaxLength;
+exports.VMin = VMin;
+exports.VMinLength = VMinLength;
+exports.VNumber = VNumber;
+exports.VPattern = VPattern;
+exports.VRequired = VRequired;
+exports.VString = VString;

package/dist/cjs/validator/validator.cjs

@@ -0,0 +1,124 @@
+'use strict';
+
+var tslib = require('tslib');
+
+var BaseValidator = /** @class */ (function () {
+    function BaseValidator() {
+        this.__keySymbol = Symbol('key-description');
+        this.__keySymbol = Symbol('key-description');
+        this[this.__keySymbol] = {};
+    }
+    BaseValidator.prototype.validate = function (itemKey, itemAll) {
+        if (itemAll === void 0) { itemAll = false; }
+        var validatorMap = this[this.__keySymbol];
+        var errors = [];
+        // 校验每个 key
+        var validators = validatorMap[itemKey];
+        if (!validators) {
+            return errors;
+        }
+        for (var _i = 0, validators_1 = validators; _i < validators_1.length; _i++) {
+            var validator = validators_1[_i];
+            var res = validator(this[itemKey]);
+            if (!res.status) {
+                errors.push(res);
+                if (!itemAll)
+                    break;
+            }
+        }
+        if (errors.length) {
+            return errors;
+        }
+        return null;
+    };
+    BaseValidator.prototype.validateAll = function (itemAll, everyItem, order) {
+        if (itemAll === void 0) { itemAll = false; }
+        if (everyItem === void 0) { everyItem = false; }
+        var validatorMap = this[this.__keySymbol];
+        var errors = [];
+        // 校验每个 key
+        var keys = order || Object.keys(validatorMap);
+        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+            var key = keys_1[_i];
+            var value = this[key];
+            var fns = validatorMap[key];
+            // 校验每个校验项目
+            for (var _a = 0, fns_1 = fns; _a < fns_1.length; _a++) {
+                var fn = fns_1[_a];
+                var res = fn(value);
+                if (!res.status) {
+                    errors.push(res);
+                    if (!itemAll)
+                        break;
+                }
+            }
+            if (!everyItem) {
+                break;
+            }
+        }
+        if (errors.length) {
+            return errors;
+        }
+        return null;
+    };
+    BaseValidator.decoratorCreator = function (func) {
+        return function (message) {
+            if (message === void 0) { message = function (val, value, context) { return "".concat(String(context.name), "\u683C\u5F0F\u9519\u8BEF"); }; }
+            return function (value, context) {
+                context.addInitializer(function () {
+                    var validators = this[this.__keySymbol];
+                    if (!validators) {
+                        this[this.__keySymbol] = {};
+                        validators = this[this.__keySymbol];
+                    }
+                    var name = context.name;
+                    var validator = function (val) {
+                        var validateStatus = func(val, value, context);
+                        if (validateStatus) {
+                            return { status: true };
+                        }
+                        else {
+                            var msg = '';
+                            if (typeof message === 'function') {
+                                msg = message(val, value, context);
+                            }
+                            else {
+                                msg = message;
+                            }
+                            return { status: false, message: msg };
+                        }
+                    };
+                    if (validators[name]) {
+                        validators[name] = tslib.__spreadArray(tslib.__spreadArray([], validators[name], true), [validator], false);
+                    }
+                    else {
+                        validators[name] = [validator];
+                    }
+                });
+            };
+        };
+    };
+    return BaseValidator;
+}());
+// class User extends BaseValidator{
+//   @VString('名称必须为字符串')
+//   @(VRequired()('名称必须填写'))
+//   name?: string;
+//   @VNumber('年龄必须为数字')
+//   @(VRequired()('年龄必须填写'))
+//   age?: number;
+//   @VEmail('邮箱格式不正确')
+//   @(VRequired()('邮箱必须填写'))
+//   email?: string;
+//   @(VMinLength(6)('密码长度不能少于6位'))
+//   @(VRequired()('密码必须填写'))
+//   password?: string
+// }
+// const user = new User();
+// user.name = '张三'
+// user.email = ' asdfasdf'
+// user.password = '12345'
+// console.log(user)
+// console.log(user.validateAll(false,true,['password','age','email']));
+
+exports.BaseValidator = BaseValidator;

package/dist/es/index.mjs

@@ -2,3 +2,5 @@ export { default as Cache } from './cache/index.mjs';
 export { default as createBaseRequest } from './request/index.mjs';
 export { createStoreGetter, createStoreGetterMemo } from './store/createGetter/index.mjs';
 export { default as createStateStore } from './store/createStateStore/index.mjs';
+export { BaseValidator } from './validator/validator.mjs';
+export { VArray, VBoolean, VEmail, VMax, VMaxLength, VMin, VMinLength, VNumber, VPattern, VRequired, VString } from './validator/decorators.mjs';

package/dist/es/request/index.mjs

@@ -36,7 +36,7 @@ function createBaseRequest(baseOptions) {
             if (method.toLowerCase() === 'post') {
                 requestDataOrParams = data;
             }
-            var _d = __assign(__assign(__assign({}, baseOptions), createOptions), options).defaultMessageShower, defaultMessageShower = _d === void 0 ? alert : _d;
+            var _d = __assign(__assign(__assign({}, baseOptions), createOptions), options).defaultMessageShower, defaultMessageShower = _d === void 0 ? console.error : _d;
             var _e = __assign(__assign(__assign({}, baseOptions), createOptions), options), _f = _e.enableCache, enableCache = _f === void 0 ? false : _f, _g = _e.cacheData, cacheData = _g === void 0 ? false : _g, _h = _e.defaultErrorCodeHandler, defaultErrorCodeHandler = _h === void 0 ? _defaultErrorCodeHandler.bind(null, defaultMessageShower) : _h, _j = _e.defaultHttpErrorCodeHandler, defaultHttpErrorCodeHandler = _j === void 0 ? _defaultHttpErrorCodeHandler.bind(null, defaultMessageShower) : _j, _k = _e.otherErrorHandler, otherErrorHandler = _k === void 0 ? _defaultOtherErrorCodeHandler.bind(null, defaultMessageShower) : _k, _l = _e.errorCodePath, errorCodePath = _l === void 0 ? 'code' : _l, _m = _e.cacheTime, cacheTime = _m === void 0 ? 60 : _m, _o = _e.errorCodeMap, errorCodeMap = _o === void 0 ? {} : _o, _p = _e.successCodes, successCodes = _p === void 0 ? ['0', '200'] : _p, _q = _e.httpErrorCodeMap, httpErrorCodeMap = _q === void 0 ? {} : _q, _r = _e.axiosOptions, axiosOptions = _r === void 0 ? {} : _r, _s = _e.throwError, throwError = _s === void 0 ? true : _s;
             if (enableCache) {
                 var cacheItem = cache.getCache(requestDataOrParams);

package/dist/es/validator/decorators.mjs

@@ -0,0 +1,92 @@
+import { BaseValidator } from './validator.mjs';
+
+function VRequired(noneVals) {
+    if (noneVals === void 0) { noneVals = [undefined]; }
+    return BaseValidator.decoratorCreator(function (val) {
+        if (noneVals.includes(val)) {
+            return false;
+        }
+        return true;
+    });
+}
+var VString = BaseValidator.decoratorCreator(function (val) {
+    if (typeof val !== 'string') {
+        return false;
+    }
+    return true;
+});
+var VNumber = BaseValidator.decoratorCreator(function (val) {
+    if (typeof val !== 'number') {
+        return false;
+    }
+    return true;
+});
+var VArray = BaseValidator.decoratorCreator(function (val) {
+    if (!Array.isArray(val)) {
+        return false;
+    }
+    return true;
+});
+// 常用校验装饰器
+var VBoolean = BaseValidator.decoratorCreator(function (val) {
+    if (typeof val !== 'boolean') {
+        return false;
+    }
+    return true;
+});
+var VMin = function (min) {
+    return BaseValidator.decoratorCreator(function (val) {
+        if (typeof val !== 'number' || val < min) {
+            return false;
+        }
+        return true;
+    });
+};
+var VMax = function (max) {
+    return BaseValidator.decoratorCreator(function (val) {
+        if (typeof val !== 'number' || val > max) {
+            return false;
+        }
+        return true;
+    });
+};
+var VMinLength = function (minLen) {
+    return BaseValidator.decoratorCreator(function (val) {
+        if (typeof val !== 'string' && !Array.isArray(val)) {
+            return false;
+        }
+        if (val.length < minLen) {
+            return false;
+        }
+        return true;
+    });
+};
+var VMaxLength = function (maxLen) {
+    return BaseValidator.decoratorCreator(function (val) {
+        if (typeof val !== 'string' && !Array.isArray(val)) {
+            return false;
+        }
+        if (val.length > maxLen) {
+            return false;
+        }
+        return true;
+    });
+};
+var VEmail = BaseValidator.decoratorCreator(function (val) {
+    if (typeof val !== 'string') {
+        return false;
+    }
+    // 简单邮箱正则
+    var emailReg = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    return emailReg.test(val);
+});
+var VPattern = function (pattern) {
+    return BaseValidator.decoratorCreator(function (val) {
+        if (typeof val !== 'string') {
+            return false;
+        }
+        return pattern.test(val);
+    });
+};
+
+export { VArray, VBoolean, VEmail, VMax, VMaxLength, VMin, VMinLength, VNumber, VPattern, VRequired, VString };

package/dist/es/validator/validator.mjs

@@ -0,0 +1,122 @@
+import { __spreadArray } from 'tslib';
+
+var BaseValidator = /** @class */ (function () {
+    function BaseValidator() {
+        this.__keySymbol = Symbol('key-description');
+        this.__keySymbol = Symbol('key-description');
+        this[this.__keySymbol] = {};
+    }
+    BaseValidator.prototype.validate = function (itemKey, itemAll) {
+        if (itemAll === void 0) { itemAll = false; }
+        var validatorMap = this[this.__keySymbol];
+        var errors = [];
+        // 校验每个 key
+        var validators = validatorMap[itemKey];
+        if (!validators) {
+            return errors;
+        }
+        for (var _i = 0, validators_1 = validators; _i < validators_1.length; _i++) {
+            var validator = validators_1[_i];
+            var res = validator(this[itemKey]);
+            if (!res.status) {
+                errors.push(res);
+                if (!itemAll)
+                    break;
+            }
+        }
+        if (errors.length) {
+            return errors;
+        }
+        return null;
+    };
+    BaseValidator.prototype.validateAll = function (itemAll, everyItem, order) {
+        if (itemAll === void 0) { itemAll = false; }
+        if (everyItem === void 0) { everyItem = false; }
+        var validatorMap = this[this.__keySymbol];
+        var errors = [];
+        // 校验每个 key
+        var keys = order || Object.keys(validatorMap);
+        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+            var key = keys_1[_i];
+            var value = this[key];
+            var fns = validatorMap[key];
+            // 校验每个校验项目
+            for (var _a = 0, fns_1 = fns; _a < fns_1.length; _a++) {
+                var fn = fns_1[_a];
+                var res = fn(value);
+                if (!res.status) {
+                    errors.push(res);
+                    if (!itemAll)
+                        break;
+                }
+            }
+            if (!everyItem) {
+                break;
+            }
+        }
+        if (errors.length) {
+            return errors;
+        }
+        return null;
+    };
+    BaseValidator.decoratorCreator = function (func) {
+        return function (message) {
+            if (message === void 0) { message = function (val, value, context) { return "".concat(String(context.name), "\u683C\u5F0F\u9519\u8BEF"); }; }
+            return function (value, context) {
+                context.addInitializer(function () {
+                    var validators = this[this.__keySymbol];
+                    if (!validators) {
+                        this[this.__keySymbol] = {};
+                        validators = this[this.__keySymbol];
+                    }
+                    var name = context.name;
+                    var validator = function (val) {
+                        var validateStatus = func(val, value, context);
+                        if (validateStatus) {
+                            return { status: true };
+                        }
+                        else {
+                            var msg = '';
+                            if (typeof message === 'function') {
+                                msg = message(val, value, context);
+                            }
+                            else {
+                                msg = message;
+                            }
+                            return { status: false, message: msg };
+                        }
+                    };
+                    if (validators[name]) {
+                        validators[name] = __spreadArray(__spreadArray([], validators[name], true), [validator], false);
+                    }
+                    else {
+                        validators[name] = [validator];
+                    }
+                });
+            };
+        };
+    };
+    return BaseValidator;
+}());
+// class User extends BaseValidator{
+//   @VString('名称必须为字符串')
+//   @(VRequired()('名称必须填写'))
+//   name?: string;
+//   @VNumber('年龄必须为数字')
+//   @(VRequired()('年龄必须填写'))
+//   age?: number;
+//   @VEmail('邮箱格式不正确')
+//   @(VRequired()('邮箱必须填写'))
+//   email?: string;
+//   @(VMinLength(6)('密码长度不能少于6位'))
+//   @(VRequired()('密码必须填写'))
+//   password?: string
+// }
+// const user = new User();
+// user.name = '张三'
+// user.email = ' asdfasdf'
+// user.password = '12345'
+// console.log(user)
+// console.log(user.validateAll(false,true,['password','age','email']));
+
+export { BaseValidator };

package/dist/types/index.d.ts

@@ -2,4 +2,6 @@ export { default as Cache, ICache, ICacheOptions, StorageMap, StorageType } from
 export { ErrorHandlerReturnType, Options, RequestOptions, default as createBaseRequest } from './request/index.js';
 export { createStoreGetter, createStoreGetterMemo } from './store/createGetter/index.js';
 export { IHookStateInitAction, IHookStateInitialSetter, IHookStateResolvable, IHookStateSetAction, IHookStateSetter, default as createStateStore } from './store/createStateStore/index.js';
+export { BaseValidator } from './validator/validator.js';
+export { VArray, VBoolean, VEmail, VMax, VMaxLength, VMin, VMinLength, VNumber, VPattern, VRequired, VString } from './validator/decorators.js';
 export { default as RequestError, RequestErrorType } from './request/error.js';

package/dist/types/validator/decorators.d.ts

@@ -0,0 +1,15 @@
+import { BaseValidator } from './validator.js';
+
+declare function VRequired(noneVals?: any[]): (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VString: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VNumber: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VArray: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VBoolean: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMin: (min: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMax: (max: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMinLength: (minLen: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMaxLength: (maxLen: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VEmail: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VPattern: (pattern: RegExp) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+
+export { VArray, VBoolean, VEmail, VMax, VMaxLength, VMin, VMinLength, VNumber, VPattern, VRequired, VString };

package/dist/types/validator/validator.d.ts

@@ -0,0 +1,24 @@
+type Validator = (val: any) => {
+    status: boolean;
+    message?: string;
+};
+type ValidatorMap = {
+    [key: string]: Validator[];
+};
+declare class BaseValidator {
+    private __keySymbol;
+    [key: symbol]: ValidatorMap;
+    [key: string]: any;
+    constructor();
+    validate(itemKey: string, itemAll?: boolean): {
+        status: boolean;
+        message?: string;
+    }[];
+    validateAll(itemAll?: boolean, everyItem?: boolean, order?: string[]): {
+        status: boolean;
+        message?: string;
+    }[];
+    static decoratorCreator: (func: (val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => boolean) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
+}
+
+export { BaseValidator };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rxtutils",
-  "version": "1.1.2-beta.1",
+  "version": "1.1.2-beta.3",
   "type": "module",
   "main": "dist/cjs/index.cjs",
   "module": "dist/es/index.mjs",
@@ -31,4 +31,4 @@
     "moment": "^2.30.1",
     "tslib": "^2.8.1"
   }
-}
+}