util-helpers 4.22.1 → 4.23.0

package/esm/AsyncMemo.js

@@ -9,7 +9,7 @@ var AsyncMemo = (function () {
     }
     AsyncMemo.prototype.run = function (asyncFn, key, options) {
         var _this = this;
-        if (!isString(key)) {
+        if (!key || !isString(key)) {
             return asyncFn();
         }
         var opts = __assign({ persisted: true }, options);

package/esm/VERSION.js

@@ -1,4 +1,4 @@
-var VERSION = "4.22.1";
+var VERSION = "4.23.0";
 var VERSION$1 = VERSION;
 
 export { VERSION$1 as default };

package/esm/index.js

@@ -35,6 +35,7 @@ export { default as normalizeString } from './normalizeString.js';
 export { default as safeDate } from './safeDate.js';
 export { default as formatMobile } from './formatMobile.js';
 export { default as padZero } from './padZero.js';
+export { default as transformObjectValue } from './transformObjectValue.js';
 export { default as plus } from './plus.js';
 export { default as minus } from './minus.js';
 export { default as times } from './times.js';
@@ -65,6 +66,6 @@ export { setDisableWarning } from './utils/config.js';
 export { default as VERSION } from './VERSION.js';
 export { default as AsyncMemo } from './AsyncMemo.js';
 
-var version = "4.22.1";
+var version = "4.23.0";
 
 export { version };

package/esm/randomString.js

@@ -1,20 +1,34 @@
-import { toNumber } from 'ut2';
+import { toNumber, randomInt } from 'ut2';
 
-var numberChars = '0123456789';
-var letterChars = 'abcdefghijklmnopqrstuvwxyz';
-var defaultChars = numberChars + letterChars + letterChars.toUpperCase();
-function internalRandomString(len, optionalChars, prefix) {
+var letter = 'abcdefghijklmnopqrstuvwxyz';
+var chars = {
+    number: '0123456789',
+    lower: letter,
+    upper: letter.toUpperCase()
+};
+var allChars = chars.number + chars.lower + chars.upper;
+function internalRandomString(len, pool, prefix) {
     if (prefix === void 0) { prefix = ''; }
     while (len-- > 0) {
-        var r = optionalChars[Math.floor(Math.random() * optionalChars.length)];
-        return internalRandomString(len, optionalChars, prefix + r);
+        var r = pool[randomInt(0, pool.length - 1)];
+        return internalRandomString(len, pool, prefix + r);
     }
     return prefix;
 }
-function randomString(len, optionalChars) {
+var randomString = function (len, pool) {
     if (len === void 0) { len = 0; }
-    var realChars = typeof optionalChars === 'string' && optionalChars ? optionalChars : defaultChars;
-    return internalRandomString(toNumber(len), realChars);
-}
+    var _pool;
+    if (typeof pool !== 'string') {
+        _pool = allChars;
+    }
+    else if (chars[pool]) {
+        _pool = chars[pool];
+    }
+    else {
+        _pool = pool;
+    }
+    return internalRandomString(toNumber(len), _pool);
+};
+var randomString$1 = randomString;
 
-export { randomString as default };
+export { randomString$1 as default };

package/esm/transformObjectValue.js

@@ -0,0 +1,25 @@
+import { isPlainObject, forEach, isArray } from 'ut2';
+
+var transformObjectValue = function (data, fn, deep) {
+    if (deep === void 0) { deep = true; }
+    if (isPlainObject(data)) {
+        var result_1 = {};
+        forEach(data, function (value, key) {
+            var newValue = deep && (isPlainObject(value) || isArray(value)) ? transformObjectValue(value, fn) : fn(value, key);
+            result_1[key] = newValue;
+        });
+        return result_1;
+    }
+    else if (isArray(data)) {
+        var result_2 = [];
+        forEach(data, function (value, index) {
+            var newValue = deep && (isPlainObject(value) || isArray(value)) ? transformObjectValue(value, fn) : fn(value, index);
+            result_2.push(newValue);
+        });
+        return result_2;
+    }
+    return data;
+};
+var transformObjectValue$1 = transformObjectValue;
+
+export { transformObjectValue$1 as default };

package/esm/validatePassword.js

@@ -1,18 +1,9 @@
 import devWarn from './utils/devWarn.js';
 
-var regNumber = /[\d]/;
+var regNumber = /\d/;
 var regLowerCaseLetter = /[a-z]/;
 var regUpperCaseLetter = /[A-Z]/;
 var regAllNumberAndLetter = /[\d|a-z]/gi;
-function hasNumber(val) {
-    return regNumber.test(val);
-}
-function hasLowerCaseLetter(val) {
-    return regLowerCaseLetter.test(val);
-}
-function hasUpperCaseLetter(val) {
-    return regUpperCaseLetter.test(val);
-}
 function hasHex(val) {
     return val.indexOf('\\x') > -1 || val.indexOf('\\u') > -1;
 }
@@ -70,9 +61,9 @@ function validatePassword(value, options) {
         valStr = '';
     }
     var currentLevel = 0;
-    var containesNumber = hasNumber(valStr);
-    var containesLowerCaseLetter = hasLowerCaseLetter(valStr);
-    var containesUpperCaseLetter = hasUpperCaseLetter(valStr);
+    var containesNumber = regNumber.test(valStr);
+    var containesLowerCaseLetter = regLowerCaseLetter.test(valStr);
+    var containesUpperCaseLetter = regUpperCaseLetter.test(valStr);
     var containesSpecialCharacter = hasSpecialCharacter(valStr, special);
     var containesUnallowableCharacter = hasUnallowableCharacter(valStr, special);
     if (containesNumber) {

package/lib/AsyncMemo.js

@@ -11,7 +11,7 @@ var AsyncMemo = (function () {
     }
     AsyncMemo.prototype.run = function (asyncFn, key, options) {
         var _this = this;
-        if (!ut2.isString(key)) {
+        if (!key || !ut2.isString(key)) {
             return asyncFn();
         }
         var opts = tslib.__assign({ persisted: true }, options);

package/lib/VERSION.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var VERSION = "4.22.1";
+var VERSION = "4.23.0";
 var VERSION$1 = VERSION;
 
 module.exports = VERSION$1;

package/lib/index.js

@@ -37,6 +37,7 @@ var normalizeString = require('./normalizeString.js');
 var safeDate = require('./safeDate.js');
 var formatMobile = require('./formatMobile.js');
 var padZero = require('./padZero.js');
+var transformObjectValue = require('./transformObjectValue.js');
 var plus = require('./plus.js');
 var minus = require('./minus.js');
 var times = require('./times.js');
@@ -67,7 +68,7 @@ var config = require('./utils/config.js');
 var VERSION = require('./VERSION.js');
 var AsyncMemo = require('./AsyncMemo.js');
 
-exports.version = "4.22.1";
+exports.version = "4.23.0";
 
 exports.isMobile = isMobile;
 exports.isTelephone = isTelephone;
@@ -106,6 +107,7 @@ exports.normalizeString = normalizeString;
 exports.safeDate = safeDate;
 exports.formatMobile = formatMobile;
 exports.padZero = padZero;
+exports.transformObjectValue = transformObjectValue;
 exports.plus = plus;
 exports.minus = minus;
 exports.times = times;

package/lib/randomString.js

@@ -2,21 +2,35 @@
 
 var ut2 = require('ut2');
 
-var numberChars = '0123456789';
-var letterChars = 'abcdefghijklmnopqrstuvwxyz';
-var defaultChars = numberChars + letterChars + letterChars.toUpperCase();
-function internalRandomString(len, optionalChars, prefix) {
+var letter = 'abcdefghijklmnopqrstuvwxyz';
+var chars = {
+    number: '0123456789',
+    lower: letter,
+    upper: letter.toUpperCase()
+};
+var allChars = chars.number + chars.lower + chars.upper;
+function internalRandomString(len, pool, prefix) {
     if (prefix === void 0) { prefix = ''; }
     while (len-- > 0) {
-        var r = optionalChars[Math.floor(Math.random() * optionalChars.length)];
-        return internalRandomString(len, optionalChars, prefix + r);
+        var r = pool[ut2.randomInt(0, pool.length - 1)];
+        return internalRandomString(len, pool, prefix + r);
     }
     return prefix;
 }
-function randomString(len, optionalChars) {
+var randomString = function (len, pool) {
     if (len === void 0) { len = 0; }
-    var realChars = typeof optionalChars === 'string' && optionalChars ? optionalChars : defaultChars;
-    return internalRandomString(ut2.toNumber(len), realChars);
-}
+    var _pool;
+    if (typeof pool !== 'string') {
+        _pool = allChars;
+    }
+    else if (chars[pool]) {
+        _pool = chars[pool];
+    }
+    else {
+        _pool = pool;
+    }
+    return internalRandomString(ut2.toNumber(len), _pool);
+};
+var randomString$1 = randomString;
 
-module.exports = randomString;
+module.exports = randomString$1;

package/lib/transformObjectValue.js

@@ -0,0 +1,27 @@
+'use strict';
+
+var ut2 = require('ut2');
+
+var transformObjectValue = function (data, fn, deep) {
+    if (deep === void 0) { deep = true; }
+    if (ut2.isPlainObject(data)) {
+        var result_1 = {};
+        ut2.forEach(data, function (value, key) {
+            var newValue = deep && (ut2.isPlainObject(value) || ut2.isArray(value)) ? transformObjectValue(value, fn) : fn(value, key);
+            result_1[key] = newValue;
+        });
+        return result_1;
+    }
+    else if (ut2.isArray(data)) {
+        var result_2 = [];
+        ut2.forEach(data, function (value, index) {
+            var newValue = deep && (ut2.isPlainObject(value) || ut2.isArray(value)) ? transformObjectValue(value, fn) : fn(value, index);
+            result_2.push(newValue);
+        });
+        return result_2;
+    }
+    return data;
+};
+var transformObjectValue$1 = transformObjectValue;
+
+module.exports = transformObjectValue$1;

package/lib/validatePassword.js

@@ -2,19 +2,10 @@
 
 var devWarn = require('./utils/devWarn.js');
 
-var regNumber = /[\d]/;
+var regNumber = /\d/;
 var regLowerCaseLetter = /[a-z]/;
 var regUpperCaseLetter = /[A-Z]/;
 var regAllNumberAndLetter = /[\d|a-z]/gi;
-function hasNumber(val) {
-    return regNumber.test(val);
-}
-function hasLowerCaseLetter(val) {
-    return regLowerCaseLetter.test(val);
-}
-function hasUpperCaseLetter(val) {
-    return regUpperCaseLetter.test(val);
-}
 function hasHex(val) {
     return val.indexOf('\\x') > -1 || val.indexOf('\\u') > -1;
 }
@@ -72,9 +63,9 @@ function validatePassword(value, options) {
         valStr = '';
     }
     var currentLevel = 0;
-    var containesNumber = hasNumber(valStr);
-    var containesLowerCaseLetter = hasLowerCaseLetter(valStr);
-    var containesUpperCaseLetter = hasUpperCaseLetter(valStr);
+    var containesNumber = regNumber.test(valStr);
+    var containesLowerCaseLetter = regLowerCaseLetter.test(valStr);
+    var containesUpperCaseLetter = regUpperCaseLetter.test(valStr);
     var containesSpecialCharacter = hasSpecialCharacter(valStr, special);
     var containesUnallowableCharacter = hasUnallowableCharacter(valStr, special);
     if (containesNumber) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.22.1",
+  "version": "4.23.0",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",

package/types/AsyncMemo.d.ts

@@ -2,11 +2,25 @@ import { Cache, CacheOptions } from 'cache2';
 /**
  * 异步缓存
  *
+ * 特点：
+ * 1. 共享异步。同一个缓存键的异步，最多同时运行一个异步，异步结果共享。
+ * 2. 持久化数据。存在缓存结果，不再执行异步方法，直接返回该结果。
+ * 3. 每个实例都有独立的缓存空间。相互之间隔离，缓存灵活配置，更多配置请查阅 [`cache2`](https://www.npmjs.com/package/cache2)。
+ *
  * @class
  * @see {@link https://www.npmjs.com/package/cache2 | cache2}
  * @param {Object} [options] 缓存配置项，更多配置项可参考 [`cache2`](https://www.npmjs.com/package/cache2)
  * @param {number} [options.max] 最大缓存数量
  * @param {'replaced' | 'limited'} [options.maxStrategy] 缓存策略
+ * @example
+ *
+ * const asyncMemo = new AsyncMemo({ max: 20, maxStrategy: 'replaced' });
+ * asyncMemo.run(()=>download({ fssid: 'a' }), 'a');
+ * asyncMemo.run(()=>download({ fssid: 'b' }), 'b');
+ * asyncMemo.run(()=>download({ fssid: 'a' }), 'a'); // 如果有缓存结果直接返回，如果有异步执行中，不会重复触发异步，但共享异步结果。
+ *
+ * asyncMemo.run(()=>download({ fssid: 'a' }), 'a', { persisted: false }); // 不读取缓存结果，但是异步执行结果还是会缓存。
+ * asyncMemo.run(()=>download({ fssid: 'a' })); // 没有缓存键时，直接执行异步方法，不读取缓存结果，也不会缓存异步结果。
  */
 declare class AsyncMemo<DataType = any> {
     private promiseCache;

package/types/index.d.ts

@@ -47,6 +47,7 @@ export { default as normalizeString } from './normalizeString';
 export { default as safeDate } from './safeDate';
 export { default as formatMobile } from './formatMobile';
 export { default as padZero } from './padZero';
+export { default as transformObjectValue } from './transformObjectValue';
 /**
  * 数学计算，修正浮点数计算问题
  *

package/types/randomString.d.ts

@@ -1,11 +1,15 @@
+interface RandomString {
+    (len: number, poll: 'number' | 'lower' | 'upper'): string;
+    (len: number, poll?: string): string;
+}
 /**
  * 生成随机字符串
  *
- * @static
+ * @function
  * @alias module:Other.randomString
  * @since 4.8.0
  * @param {number} [len=0] 长度
- * @param {string} [optionalChars='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'] 允许的字符，默认为数字和大小写字母
+ * @param {'number' | 'lower' | 'upper' | string} [pool='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'] 字符池，默认为数字和大小写字母，支持number/lower/upper
  * @returns {string} 随机字符串
  * @example
  *
@@ -17,5 +21,5 @@
  * randomString(8, 'abcefg'); // bcgcfabg
  *
  */
-declare function randomString(len?: number, optionalChars?: string): string;
+declare const randomString: RandomString;
 export default randomString;

package/types/transformObjectValue.d.ts

@@ -0,0 +1,67 @@
+type PropertyName = string | symbol;
+interface TransformObjectValue {
+    <V>(arr: V[], fn: (value: V, index: number) => any, deep: false): any[];
+    <V>(arr: V[], fn: (value: any, index: number) => any, deep?: boolean): any[];
+    <T extends object>(obj: T, fn: (value: T[keyof T], key: keyof T) => any, deep: false): Record<PropertyName, any>;
+    <T extends object>(obj: T, fn: (value: T[keyof T] extends object ? any : T[keyof T], key: T[keyof T] extends object ? any : keyof T) => any, deep?: boolean): Record<PropertyName, any>;
+    <T>(obj: T, fn: (...args: any[]) => any): T;
+}
+/**
+ * 创建一个转换值的新对象或数组。
+ *
+ * 例如 antd Form 中的设置表单值时，如果值为空字符串可能需要转为 `undefined` ，才不影响表单的初始值。
+ *
+ * @static
+ * @alias module:Processor.transformObjectValue
+ * @since 4.23.0
+ * @param {Array | Object} data 要转换值的普通对象或数组
+ * @param {Function} fn 遍历普通对象或数组键值方法
+ * @param {boolean} [deep=true] 深度遍历，检测值为普通对象或数组时递归处理。默认 true 。
+ * @returns {Array | Object} 如果是普通对象或数组，返回一个新的对象或数组，否则返回自身
+ * @example
+ *
+ * const data1 = { foo: 'bar', baz: 42 }
+ * // 数字转为字符串
+ * transformObjectValue(data1, value => {
+ *   if(typeof value === 'number'){
+ *     return String(value)
+ *   }
+ *   return value;
+ * });
+ * // { foo: 'bar', baz: '42' }
+ *
+ * const data2 = [1,2,3,4];
+ * // 数字转为字符串
+ * transformObjectValue(data2, value=>{
+ *   if(typeof value === 'number'){
+ *     return String(value)
+ *   }
+ * });
+ * // ['1', '2', '3', '4']
+ *
+ * // 嵌套普通对象或数组
+ * const data3 = { foo: 'bar', baz: 42, c: [1,2,3,4], d: '' }
+ * // 数字转为字符串，空字符串转为undefined
+ * transformObjectValue(data3, value=>{
+ *   if(typeof value === 'number'){
+ *     return String(value);
+ *   }
+ *   retrun value === '' ? undefined : value
+ * });
+ * // { foo: 'bar', baz: '42', ['1', '2', '3', '4'], d: undefined }
+ *
+ * // 数组的值不处理，对象值为数字转为字符串，空字符串转为undefined
+ * transformObjectValue(data3, (value, key)=>{
+ *   if(typeof key === 'number'){
+ *     return value;
+ *   }
+ *   if(typeof value === 'number'){
+ *     return String(value);
+ *   }
+ *   retrun value === '' ? undefined : value
+ * });
+ * // { foo: 'bar', baz: '42', [1, 2, 3, 4], d: undefined }
+ *
+ */
+declare const transformObjectValue: TransformObjectValue;
+export default transformObjectValue;