util-helpers 4.22.2 → 4.23.1

package/esm/VERSION.js

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

package/esm/getImageInfo.js

@@ -1,19 +1,19 @@
-import { round } from 'ut2';
+import { defaultTo, round } from 'ut2';
 import divide from './divide.js';
 import gcd from './gcd.js';
 import loadImageWithBlob from './loadImageWithBlob.js';
 import bytesToSize from './bytesToSize.js';
-import Cache from './utils/Cache.js';
 import { revokeObjectURL } from './utils/native.js';
+import AsyncMemo from './AsyncMemo.js';
 
-var cache = new Cache({ max: 1 });
-cache.on('del', function (v) {
-    if (v.r) {
-        try {
+var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
+asyncMemo.cache.on('del', function (k, v) {
+    try {
+        if (v.r) {
             revokeObjectURL(v.data.image.src);
         }
-        catch (_a) {
-        }
+    }
+    catch (_a) {
     }
 });
 function calcContrast(w, h) {
@@ -22,40 +22,34 @@ function calcContrast(w, h) {
 }
 function getImageInfo(img, cacheOptions, ajaxOptions) {
     if (cacheOptions === void 0) { cacheOptions = true; }
+    var cacheOptionsIsObject = typeof cacheOptions === 'object';
     var _cacheOptions = {
-        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
-        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+        useCache: cacheOptionsIsObject ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: cacheOptionsIsObject ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions,
+        cacheKey: defaultTo(cacheOptionsIsObject ? cacheOptions.cacheKey : undefined, typeof img === 'string' ? img : undefined)
     };
-    return new Promise(function (resolve, reject) {
-        if (_cacheOptions.useCache && cache.has(img)) {
-            resolve(cache.get(img).data);
-        }
-        else {
-            loadImageWithBlob(img, false, ajaxOptions)
-                .then(function (_a) {
-                var image = _a.image, blob = _a.blob;
-                var width = image.width, height = image.height;
-                var result = {
-                    width: width,
-                    height: height,
-                    contrast: calcContrast(width, height),
-                    measure: "".concat(width, " \u00D7 ").concat(height, " px"),
-                    size: bytesToSize(blob.size),
-                    bytes: blob.size,
-                    image: image,
-                    blob: blob
-                };
-                if (_cacheOptions.useCache) {
-                    cache.set(img, {
-                        data: result,
-                        r: _cacheOptions.autoRevokeOnDel
-                    });
-                }
-                resolve(result);
-            })
-                .catch(reject);
-        }
-    });
+    return asyncMemo
+        .run(function () {
+        return loadImageWithBlob(img, false, ajaxOptions).then(function (_a) {
+            var image = _a.image, blob = _a.blob;
+            var width = image.width, height = image.height;
+            var data = {
+                width: width,
+                height: height,
+                contrast: calcContrast(width, height),
+                measure: "".concat(width, " \u00D7 ").concat(height, " px"),
+                size: bytesToSize(blob.size),
+                bytes: blob.size,
+                image: image,
+                blob: blob
+            };
+            return {
+                data: data,
+                r: _cacheOptions.autoRevokeOnDel
+            };
+        });
+    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+        .then(function (res) { return res.data; });
 }
 
 export { getImageInfo 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.2";
+var version = "4.23.1";
 
 export { version };

package/esm/loadImage.js

@@ -1,53 +1,51 @@
-import { isBlob } from 'ut2';
+import { defaultTo, isBlob } from 'ut2';
 import { revokeObjectURL, createObjectURL } from './utils/native.js';
-import Cache from './utils/Cache.js';
+import AsyncMemo from './AsyncMemo.js';
 
-var cache = new Cache({ max: 1 });
-cache.on('del', function (v) {
-    if (v.r) {
-        try {
+var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
+asyncMemo.cache.on('del', function (k, v) {
+    try {
+        if (v.r) {
             revokeObjectURL(v.data.src);
         }
-        catch (_a) {
-        }
+    }
+    catch (_a) {
     }
 });
 function loadImage(img, cacheOptions) {
     if (cacheOptions === void 0) { cacheOptions = true; }
+    var cacheOptionsIsObject = typeof cacheOptions === 'object';
     var _cacheOptions = {
-        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
-        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+        useCache: cacheOptionsIsObject ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: cacheOptionsIsObject ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions,
+        cacheKey: defaultTo(cacheOptionsIsObject ? cacheOptions.cacheKey : undefined, typeof img === 'string' ? img : undefined)
     };
-    return new Promise(function (resolve, reject) {
-        if (_cacheOptions.useCache && cache.has(img)) {
-            resolve(cache.get(img).data);
-        }
-        else {
-            var imgIsBlob_1 = isBlob(img);
-            var url_1 = imgIsBlob_1 ? createObjectURL(img) : img;
-            var image_1 = new Image();
-            if (!imgIsBlob_1) {
-                image_1.crossOrigin = 'anonymous';
+    return asyncMemo
+        .run(function () {
+        return new Promise(function (resolve, reject) {
+            var imgIsBlob = isBlob(img);
+            var url = imgIsBlob ? createObjectURL(img) : img;
+            var image = new Image();
+            if (!imgIsBlob) {
+                image.crossOrigin = 'anonymous';
             }
-            image_1.onload = function () {
-                if (_cacheOptions.useCache) {
-                    cache.set(img, {
-                        data: image_1,
-                        r: _cacheOptions.autoRevokeOnDel
-                    });
-                }
-                resolve(image_1);
+            image.onload = function () {
+                resolve({
+                    data: image,
+                    r: _cacheOptions.autoRevokeOnDel
+                });
             };
-            image_1.onerror = function (err) {
-                if (imgIsBlob_1) {
-                    revokeObjectURL(url_1);
+            image.onerror = function (err) {
+                if (imgIsBlob) {
+                    revokeObjectURL(url);
                 }
                 console.error("[loadImage] The image load failed, '".concat(img, "'."));
                 reject(err);
             };
-            image_1.src = url_1;
-        }
-    });
+            image.src = url;
+        });
+    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+        .then(function (res) { return res.data; });
 }
 
 export { loadImage as default };

package/esm/loadImageWithBlob.js

@@ -1,41 +1,39 @@
 import { revokeObjectURL, createObjectURL } from './utils/native.js';
 import getFileBlob from './getFileBlob.js';
-import Cache from './utils/Cache.js';
+import AsyncMemo from './AsyncMemo.js';
+import { defaultTo } from 'ut2';
 
-var cache = new Cache({ max: 1 });
-cache.on('del', function (v) {
-    if (v.r) {
-        try {
+var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
+asyncMemo.cache.on('del', function (k, v) {
+    try {
+        if (v.r) {
             revokeObjectURL(v.data.image.src);
         }
-        catch (_a) {
-        }
+    }
+    catch (_a) {
     }
 });
 function loadImageWithBlob(img, cacheOptions, ajaxOptions) {
     if (cacheOptions === void 0) { cacheOptions = true; }
+    var cacheOptionsIsObject = typeof cacheOptions === 'object';
     var _cacheOptions = {
-        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
-        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+        useCache: cacheOptionsIsObject ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: cacheOptionsIsObject ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions,
+        cacheKey: defaultTo(cacheOptionsIsObject ? cacheOptions.cacheKey : undefined, typeof img === 'string' ? img : undefined)
     };
-    return new Promise(function (resolve, reject) {
-        if (_cacheOptions.useCache && cache.has(img)) {
-            resolve(cache.get(img).data);
-        }
-        else {
+    return asyncMemo
+        .run(function () {
+        return new Promise(function (resolve, reject) {
             getFileBlob(img, ajaxOptions)
                 .then(function (blob) {
                 var url = createObjectURL(blob);
                 var image = new Image();
                 image.onload = function () {
-                    var result = { blob: blob, image: image };
-                    if (_cacheOptions.useCache) {
-                        cache.set(img, {
-                            data: result,
-                            r: _cacheOptions.autoRevokeOnDel
-                        });
-                    }
-                    resolve(result);
+                    var data = { blob: blob, image: image };
+                    resolve({
+                        data: data,
+                        r: _cacheOptions.autoRevokeOnDel
+                    });
                 };
                 image.onerror = function (err) {
                     revokeObjectURL(url);
@@ -45,8 +43,9 @@ function loadImageWithBlob(img, cacheOptions, ajaxOptions) {
                 image.src = url;
             })
                 .catch(reject);
-        }
-    });
+        });
+    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+        .then(function (res) { return res.data; });
 }
 
 export { loadImageWithBlob as default };

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/VERSION.js

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

package/lib/getImageInfo.js

@@ -5,17 +5,17 @@ var divide = require('./divide.js');
 var gcd = require('./gcd.js');
 var loadImageWithBlob = require('./loadImageWithBlob.js');
 var bytesToSize = require('./bytesToSize.js');
-var Cache = require('./utils/Cache.js');
 var native = require('./utils/native.js');
+var AsyncMemo = require('./AsyncMemo.js');
 
-var cache = new Cache({ max: 1 });
-cache.on('del', function (v) {
-    if (v.r) {
-        try {
+var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
+asyncMemo.cache.on('del', function (k, v) {
+    try {
+        if (v.r) {
             native.revokeObjectURL(v.data.image.src);
         }
-        catch (_a) {
-        }
+    }
+    catch (_a) {
     }
 });
 function calcContrast(w, h) {
@@ -24,40 +24,34 @@ function calcContrast(w, h) {
 }
 function getImageInfo(img, cacheOptions, ajaxOptions) {
     if (cacheOptions === void 0) { cacheOptions = true; }
+    var cacheOptionsIsObject = typeof cacheOptions === 'object';
     var _cacheOptions = {
-        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
-        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+        useCache: cacheOptionsIsObject ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: cacheOptionsIsObject ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions,
+        cacheKey: ut2.defaultTo(cacheOptionsIsObject ? cacheOptions.cacheKey : undefined, typeof img === 'string' ? img : undefined)
     };
-    return new Promise(function (resolve, reject) {
-        if (_cacheOptions.useCache && cache.has(img)) {
-            resolve(cache.get(img).data);
-        }
-        else {
-            loadImageWithBlob(img, false, ajaxOptions)
-                .then(function (_a) {
-                var image = _a.image, blob = _a.blob;
-                var width = image.width, height = image.height;
-                var result = {
-                    width: width,
-                    height: height,
-                    contrast: calcContrast(width, height),
-                    measure: "".concat(width, " \u00D7 ").concat(height, " px"),
-                    size: bytesToSize(blob.size),
-                    bytes: blob.size,
-                    image: image,
-                    blob: blob
-                };
-                if (_cacheOptions.useCache) {
-                    cache.set(img, {
-                        data: result,
-                        r: _cacheOptions.autoRevokeOnDel
-                    });
-                }
-                resolve(result);
-            })
-                .catch(reject);
-        }
-    });
+    return asyncMemo
+        .run(function () {
+        return loadImageWithBlob(img, false, ajaxOptions).then(function (_a) {
+            var image = _a.image, blob = _a.blob;
+            var width = image.width, height = image.height;
+            var data = {
+                width: width,
+                height: height,
+                contrast: calcContrast(width, height),
+                measure: "".concat(width, " \u00D7 ").concat(height, " px"),
+                size: bytesToSize(blob.size),
+                bytes: blob.size,
+                image: image,
+                blob: blob
+            };
+            return {
+                data: data,
+                r: _cacheOptions.autoRevokeOnDel
+            };
+        });
+    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+        .then(function (res) { return res.data; });
 }
 
 module.exports = getImageInfo;

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.2";
+exports.version = "4.23.1";
 
 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/loadImage.js

@@ -2,54 +2,52 @@
 
 var ut2 = require('ut2');
 var native = require('./utils/native.js');
-var Cache = require('./utils/Cache.js');
+var AsyncMemo = require('./AsyncMemo.js');
 
-var cache = new Cache({ max: 1 });
-cache.on('del', function (v) {
-    if (v.r) {
-        try {
+var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
+asyncMemo.cache.on('del', function (k, v) {
+    try {
+        if (v.r) {
             native.revokeObjectURL(v.data.src);
         }
-        catch (_a) {
-        }
+    }
+    catch (_a) {
     }
 });
 function loadImage(img, cacheOptions) {
     if (cacheOptions === void 0) { cacheOptions = true; }
+    var cacheOptionsIsObject = typeof cacheOptions === 'object';
     var _cacheOptions = {
-        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
-        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+        useCache: cacheOptionsIsObject ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: cacheOptionsIsObject ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions,
+        cacheKey: ut2.defaultTo(cacheOptionsIsObject ? cacheOptions.cacheKey : undefined, typeof img === 'string' ? img : undefined)
     };
-    return new Promise(function (resolve, reject) {
-        if (_cacheOptions.useCache && cache.has(img)) {
-            resolve(cache.get(img).data);
-        }
-        else {
-            var imgIsBlob_1 = ut2.isBlob(img);
-            var url_1 = imgIsBlob_1 ? native.createObjectURL(img) : img;
-            var image_1 = new Image();
-            if (!imgIsBlob_1) {
-                image_1.crossOrigin = 'anonymous';
+    return asyncMemo
+        .run(function () {
+        return new Promise(function (resolve, reject) {
+            var imgIsBlob = ut2.isBlob(img);
+            var url = imgIsBlob ? native.createObjectURL(img) : img;
+            var image = new Image();
+            if (!imgIsBlob) {
+                image.crossOrigin = 'anonymous';
             }
-            image_1.onload = function () {
-                if (_cacheOptions.useCache) {
-                    cache.set(img, {
-                        data: image_1,
-                        r: _cacheOptions.autoRevokeOnDel
-                    });
-                }
-                resolve(image_1);
+            image.onload = function () {
+                resolve({
+                    data: image,
+                    r: _cacheOptions.autoRevokeOnDel
+                });
             };
-            image_1.onerror = function (err) {
-                if (imgIsBlob_1) {
-                    native.revokeObjectURL(url_1);
+            image.onerror = function (err) {
+                if (imgIsBlob) {
+                    native.revokeObjectURL(url);
                 }
                 console.error("[loadImage] The image load failed, '".concat(img, "'."));
                 reject(err);
             };
-            image_1.src = url_1;
-        }
-    });
+            image.src = url;
+        });
+    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+        .then(function (res) { return res.data; });
 }
 
 module.exports = loadImage;