util-helpers 4.23.1 → 4.23.3

package/esm/VERSION.js

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

package/esm/getImageInfo.js

@@ -1,10 +1,11 @@
-import { defaultTo, round } from 'ut2';
+import { round } from 'ut2';
 import divide from './divide.js';
 import gcd from './gcd.js';
 import loadImageWithBlob from './loadImageWithBlob.js';
 import bytesToSize from './bytesToSize.js';
 import { revokeObjectURL } from './utils/native.js';
 import AsyncMemo from './AsyncMemo.js';
+import getCacheKey from './utils/getCacheKey.js';
 
 var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
 asyncMemo.cache.on('del', function (k, v) {
@@ -26,8 +27,9 @@ function getImageInfo(img, cacheOptions, ajaxOptions) {
     var _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)
+        cacheKey: cacheOptionsIsObject ? cacheOptions.cacheKey : undefined
     };
+    var cacheKey = _cacheOptions.useCache ? getCacheKey(_cacheOptions.cacheKey || img) : undefined;
     return asyncMemo
         .run(function () {
         return loadImageWithBlob(img, false, ajaxOptions).then(function (_a) {
@@ -48,7 +50,7 @@ function getImageInfo(img, cacheOptions, ajaxOptions) {
                 r: _cacheOptions.autoRevokeOnDel
             };
         });
-    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+    }, cacheKey)
         .then(function (res) { return res.data; });
 }
 

package/esm/index.js

@@ -66,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.23.1";
+var version = "4.23.3";
 
 export { version };

package/esm/loadImage.js

@@ -1,6 +1,7 @@
-import { defaultTo, isBlob } from 'ut2';
+import { isBlob } from 'ut2';
 import { revokeObjectURL, createObjectURL } from './utils/native.js';
 import AsyncMemo from './AsyncMemo.js';
+import getCacheKey from './utils/getCacheKey.js';
 
 var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
 asyncMemo.cache.on('del', function (k, v) {
@@ -18,8 +19,9 @@ function loadImage(img, cacheOptions) {
     var _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)
+        cacheKey: cacheOptionsIsObject ? cacheOptions.cacheKey : undefined
     };
+    var cacheKey = _cacheOptions.useCache ? getCacheKey(_cacheOptions.cacheKey || img) : undefined;
     return asyncMemo
         .run(function () {
         return new Promise(function (resolve, reject) {
@@ -44,7 +46,7 @@ function loadImage(img, cacheOptions) {
             };
             image.src = url;
         });
-    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+    }, cacheKey)
         .then(function (res) { return res.data; });
 }
 

package/esm/loadImageWithBlob.js

@@ -1,7 +1,7 @@
 import { revokeObjectURL, createObjectURL } from './utils/native.js';
 import getFileBlob from './getFileBlob.js';
 import AsyncMemo from './AsyncMemo.js';
-import { defaultTo } from 'ut2';
+import getCacheKey from './utils/getCacheKey.js';
 
 var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
 asyncMemo.cache.on('del', function (k, v) {
@@ -19,8 +19,9 @@ function loadImageWithBlob(img, cacheOptions, ajaxOptions) {
     var _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)
+        cacheKey: cacheOptionsIsObject ? cacheOptions.cacheKey : undefined
     };
+    var cacheKey = _cacheOptions.useCache ? getCacheKey(_cacheOptions.cacheKey || img) : undefined;
     return asyncMemo
         .run(function () {
         return new Promise(function (resolve, reject) {
@@ -44,7 +45,7 @@ function loadImageWithBlob(img, cacheOptions, ajaxOptions) {
             })
                 .catch(reject);
         });
-    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+    }, cacheKey)
         .then(function (res) { return res.data; });
 }
 

package/esm/utils/getCacheKey.js

@@ -0,0 +1,15 @@
+import { uniqueId } from 'ut2';
+
+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 getCacheKey$1 = getCacheKey;
+
+export { getCacheKey$1 as default };

package/lib/VERSION.js

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

package/lib/getImageInfo.js

@@ -7,6 +7,7 @@ var loadImageWithBlob = require('./loadImageWithBlob.js');
 var bytesToSize = require('./bytesToSize.js');
 var native = require('./utils/native.js');
 var AsyncMemo = require('./AsyncMemo.js');
+var getCacheKey = require('./utils/getCacheKey.js');
 
 var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
 asyncMemo.cache.on('del', function (k, v) {
@@ -28,8 +29,9 @@ function getImageInfo(img, cacheOptions, ajaxOptions) {
     var _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)
+        cacheKey: cacheOptionsIsObject ? cacheOptions.cacheKey : undefined
     };
+    var cacheKey = _cacheOptions.useCache ? getCacheKey(_cacheOptions.cacheKey || img) : undefined;
     return asyncMemo
         .run(function () {
         return loadImageWithBlob(img, false, ajaxOptions).then(function (_a) {
@@ -50,7 +52,7 @@ function getImageInfo(img, cacheOptions, ajaxOptions) {
                 r: _cacheOptions.autoRevokeOnDel
             };
         });
-    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+    }, cacheKey)
         .then(function (res) { return res.data; });
 }
 

package/lib/index.js

@@ -68,7 +68,7 @@ var config = require('./utils/config.js');
 var VERSION = require('./VERSION.js');
 var AsyncMemo = require('./AsyncMemo.js');
 
-exports.version = "4.23.1";
+exports.version = "4.23.3";
 
 exports.isMobile = isMobile;
 exports.isTelephone = isTelephone;

package/lib/loadImage.js

@@ -3,6 +3,7 @@
 var ut2 = require('ut2');
 var native = require('./utils/native.js');
 var AsyncMemo = require('./AsyncMemo.js');
+var getCacheKey = require('./utils/getCacheKey.js');
 
 var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
 asyncMemo.cache.on('del', function (k, v) {
@@ -20,8 +21,9 @@ function loadImage(img, cacheOptions) {
     var _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)
+        cacheKey: cacheOptionsIsObject ? cacheOptions.cacheKey : undefined
     };
+    var cacheKey = _cacheOptions.useCache ? getCacheKey(_cacheOptions.cacheKey || img) : undefined;
     return asyncMemo
         .run(function () {
         return new Promise(function (resolve, reject) {
@@ -46,7 +48,7 @@ function loadImage(img, cacheOptions) {
             };
             image.src = url;
         });
-    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+    }, cacheKey)
         .then(function (res) { return res.data; });
 }
 

package/lib/loadImageWithBlob.js

@@ -3,7 +3,7 @@
 var native = require('./utils/native.js');
 var getFileBlob = require('./getFileBlob.js');
 var AsyncMemo = require('./AsyncMemo.js');
-var ut2 = require('ut2');
+var getCacheKey = require('./utils/getCacheKey.js');
 
 var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
 asyncMemo.cache.on('del', function (k, v) {
@@ -21,8 +21,9 @@ function loadImageWithBlob(img, cacheOptions, ajaxOptions) {
     var _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)
+        cacheKey: cacheOptionsIsObject ? cacheOptions.cacheKey : undefined
     };
+    var cacheKey = _cacheOptions.useCache ? getCacheKey(_cacheOptions.cacheKey || img) : undefined;
     return asyncMemo
         .run(function () {
         return new Promise(function (resolve, reject) {
@@ -46,7 +47,7 @@ function loadImageWithBlob(img, cacheOptions, ajaxOptions) {
             })
                 .catch(reject);
         });
-    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
+    }, cacheKey)
         .then(function (res) { return res.data; });
 }
 

package/lib/utils/getCacheKey.js

@@ -0,0 +1,17 @@
+'use strict';
+
+var ut2 = require('ut2');
+
+var wm = new WeakMap();
+var getCacheKey = function (obj) {
+    if (typeof obj === 'string' || !obj) {
+        return obj;
+    }
+    if (!wm.has(obj)) {
+        wm.set(obj, ut2.uniqueId('__uh_cache_key__'));
+    }
+    return wm.get(obj);
+};
+var getCacheKey$1 = getCacheKey;
+
+module.exports = getCacheKey$1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.23.1",
+  "version": "4.23.3",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -92,12 +92,13 @@
     }
   },
   "dependencies": {
-    "cache2": "^2.0.5",
+    "cache2": "^3.0.0",
     "emitter-pro": "^1.2.1",
     "tslib": "^2.6.3",
     "ut2": "^1.9.1"
   },
   "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
+    "registry": "https://registry.npmjs.org/",
+    "tag": "latest-4"
   }
 }

package/types/utils/getCacheKey.d.ts

@@ -0,0 +1,2 @@
+declare const getCacheKey: (obj: string | Blob) => any;
+export default getCacheKey;

package/types/utils/Cache.d.ts

@@ -1,14 +0,0 @@
-import Emitter from 'emitter-pro';
-type Options = {
-    max: number;
-};
-declare class Cache<V = any, K = any> extends Emitter<(v: V, k: K) => void> {
-    private data;
-    private options;
-    constructor(options?: Options);
-    has(k: K): boolean;
-    get(k: K): V | undefined;
-    private checkLimit;
-    set(k: K, v: V): void;
-}
-export default Cache;