util-helpers 4.23.2 → 4.23.4

package/dist/util-helpers.js

@@ -200,11 +200,6 @@
         return isNil(value) ? '' : baseToString(value);
     }
 
-    var defaultTo = function (value, defaultValue) {
-        return value == null || value !== value ? defaultValue : value;
-    };
-    var defaultTo$1 = defaultTo;
-
     var blobExisted = typeof Blob !== stringUndefined;
     function isBlob(value) {
         if (blobExisted && value instanceof Blob) {
@@ -283,6 +278,7 @@
 
     var idCounter = 0;
     function uniqueId(prefix) {
+        if (prefix === void 0) { prefix = ''; }
         var id = ++idCounter;
         return toString(prefix) + id;
     }
@@ -2006,6 +2002,17 @@
         return AsyncMemo;
     }());
 
+    var wm = new WeakMap();
+    var getCacheKey = function (obj) {
+        if (typeof obj === 'string' || !obj) {
+            return obj;
+        }
+        if (!wm.has(obj)) {
+            wm.set(obj, uniqueId('__uh_cache_key__'));
+        }
+        return wm.get(obj);
+    };
+
     var asyncMemo$2 = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
     asyncMemo$2.cache.on('del', function (k, v) {
         try {
@@ -2022,8 +2029,9 @@
         var _cacheOptions = {
             useCache: cacheOptionsIsObject ? cacheOptions.useCache !== false : cacheOptions !== false,
             autoRevokeOnDel: cacheOptionsIsObject ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions,
-            cacheKey: defaultTo$1(cacheOptionsIsObject ? cacheOptions.cacheKey : undefined, typeof img === 'string' ? img : undefined)
+            cacheKey: cacheOptionsIsObject ? cacheOptions.cacheKey : undefined
         };
+        var cacheKey = _cacheOptions.useCache ? getCacheKey(_cacheOptions.cacheKey || img) : undefined;
         return asyncMemo$2
             .run(function () {
             return new Promise(function (resolve, reject) {
@@ -2047,7 +2055,7 @@
                 })
                     .catch(reject);
             });
-        }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+        }, cacheKey)
             .then(function (res) { return res.data; });
     }
 
@@ -2219,8 +2227,9 @@
         var _cacheOptions = {
             useCache: cacheOptionsIsObject ? cacheOptions.useCache !== false : cacheOptions !== false,
             autoRevokeOnDel: cacheOptionsIsObject ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions,
-            cacheKey: defaultTo$1(cacheOptionsIsObject ? cacheOptions.cacheKey : undefined, typeof img === 'string' ? img : undefined)
+            cacheKey: cacheOptionsIsObject ? cacheOptions.cacheKey : undefined
         };
+        var cacheKey = _cacheOptions.useCache ? getCacheKey(_cacheOptions.cacheKey || img) : undefined;
         return asyncMemo$1
             .run(function () {
             return loadImageWithBlob(img, false, ajaxOptions).then(function (_a) {
@@ -2241,7 +2250,7 @@
                     r: _cacheOptions.autoRevokeOnDel
                 };
             });
-        }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+        }, cacheKey)
             .then(function (res) { return res.data; });
     }
 
@@ -2261,8 +2270,9 @@
         var _cacheOptions = {
             useCache: cacheOptionsIsObject ? cacheOptions.useCache !== false : cacheOptions !== false,
             autoRevokeOnDel: cacheOptionsIsObject ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions,
-            cacheKey: defaultTo$1(cacheOptionsIsObject ? cacheOptions.cacheKey : undefined, typeof img === 'string' ? img : undefined)
+            cacheKey: cacheOptionsIsObject ? cacheOptions.cacheKey : undefined
         };
+        var cacheKey = _cacheOptions.useCache ? getCacheKey(_cacheOptions.cacheKey || img) : undefined;
         return asyncMemo
             .run(function () {
             return new Promise(function (resolve, reject) {
@@ -2287,7 +2297,7 @@
                 };
                 image.src = url;
             });
-        }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+        }, cacheKey)
             .then(function (res) { return res.data; });
     }
 
@@ -2640,9 +2650,9 @@
         return internalFindTreeSelect(tree, predicate, childrenField);
     }
 
-    var VERSION = "4.23.2";
+    var VERSION = "4.23.4";
 
-    var version = "4.23.2";
+    var version = "4.23.4";
 
     exports.AsyncMemo = AsyncMemo;
     exports.VERSION = VERSION;