util-helpers 4.21.0 → 4.21.2

package/esm/VERSION.js

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

package/esm/compressImage.js

@@ -32,7 +32,11 @@ function compressImage(img, options) {
             var numCanvasHeight = toNumber(typeof canvasHeight === 'function' ? canvasHeight(info, options) : canvasHeight);
             canvas.width = numCanvasWidth || image.width;
             canvas.height = numCanvasHeight || image.height;
-            if (background && background !== 'none') {
+            var bgIsTransparent = background === 'none' || background === 'transparent';
+            if (bgIsTransparent) {
+                ctx.clearRect(0, 0, canvas.width, canvas.height);
+            }
+            else {
                 ctx.fillStyle = background;
                 ctx.fillRect(0, 0, canvas.width, canvas.height);
             }
@@ -44,7 +48,13 @@ function compressImage(img, options) {
             }
             var outOffset = typeof offset === 'function' ? offset(info, options) : offset;
             beforeDraw === null || beforeDraw === void 0 ? void 0 : beforeDraw(info, options);
-            ctx.drawImage(image, internalOffset[0] + toNumber(outOffset[0]), internalOffset[1] + toNumber(outOffset[1]), image.width, image.height);
+            var dx = internalOffset[0] + toNumber(outOffset[0]);
+            var dy = internalOffset[1] + toNumber(outOffset[1]);
+            ctx.drawImage(image, dx, dy, image.width, image.height);
+            if (type === 'image/png' && bgIsTransparent) {
+                ctx.globalCompositeOperation = 'destination-in';
+                ctx.drawImage(image, dx, dy, image.width, image.height);
+            }
             afterDraw === null || afterDraw === void 0 ? void 0 : afterDraw(info, options);
             if (format === 'blob') {
                 canvasToBlob(canvas, type, numQuality).then(resolve).catch(reject);

package/esm/getImageInfo.js

@@ -3,18 +3,32 @@ 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';
 
+var cache = new Cache({ max: 1 });
+cache.on('del', function (v) {
+    if (v.r) {
+        try {
+            revokeObjectURL(v.data.image.src);
+        }
+        catch (_a) {
+        }
+    }
+});
 function calcContrast(w, h) {
     var n = gcd(w, h);
     return "".concat(divide(round(w), n), ":").concat(divide(round(h), n));
 }
-var cacheImage;
-var cacheResult;
-function getImageInfo(img, useCache, ajaxOptions) {
-    if (useCache === void 0) { useCache = true; }
+function getImageInfo(img, cacheOptions, ajaxOptions) {
+    if (cacheOptions === void 0) { cacheOptions = true; }
+    var _cacheOptions = {
+        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+    };
     return new Promise(function (resolve, reject) {
-        if (useCache && cacheImage === img && cacheResult) {
-            resolve(cacheResult);
+        if (_cacheOptions.useCache && cache.has(img)) {
+            resolve(cache.get(img).data);
         }
         else {
             loadImageWithBlob(img, false, ajaxOptions)
@@ -31,9 +45,11 @@ function getImageInfo(img, useCache, ajaxOptions) {
                     image: image,
                     blob: blob
                 };
-                if (useCache) {
-                    cacheImage = img;
-                    cacheResult = result;
+                if (_cacheOptions.useCache) {
+                    cache.set(img, {
+                        data: result,
+                        r: _cacheOptions.autoRevokeOnDel
+                    });
                 }
                 resolve(result);
             })

package/esm/index.js

@@ -64,6 +64,6 @@ export { default as findTreeSelect } from './findTreeSelect.js';
 export { setDisableWarning } from './utils/config.js';
 export { default as VERSION } from './VERSION.js';
 
-var version = "4.21.0";
+var version = "4.21.2";
 
 export { version };

package/esm/loadImage.js

@@ -1,13 +1,26 @@
 import { isBlob } from 'ut2';
-import { createObjectURL, revokeObjectURL } from './utils/native.js';
+import { revokeObjectURL, createObjectURL } from './utils/native.js';
+import Cache from './utils/Cache.js';
 
-var cacheImage;
-var cacheResult;
-function loadImage(img, useCache) {
-    if (useCache === void 0) { useCache = true; }
+var cache = new Cache({ max: 1 });
+cache.on('del', function (v) {
+    if (v.r) {
+        try {
+            revokeObjectURL(v.data.src);
+        }
+        catch (_a) {
+        }
+    }
+});
+function loadImage(img, cacheOptions) {
+    if (cacheOptions === void 0) { cacheOptions = true; }
+    var _cacheOptions = {
+        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+    };
     return new Promise(function (resolve, reject) {
-        if (useCache && cacheImage === img && cacheResult) {
-            resolve(cacheResult);
+        if (_cacheOptions.useCache && cache.has(img)) {
+            resolve(cache.get(img).data);
         }
         else {
             var imgIsBlob_1 = isBlob(img);
@@ -17,12 +30,11 @@ function loadImage(img, useCache) {
                 image_1.crossOrigin = 'anonymous';
             }
             image_1.onload = function () {
-                if (imgIsBlob_1) {
-                    revokeObjectURL(url_1);
-                }
-                if (useCache) {
-                    cacheImage = img;
-                    cacheResult = image_1;
+                if (_cacheOptions.useCache) {
+                    cache.set(img, {
+                        data: image_1,
+                        r: _cacheOptions.autoRevokeOnDel
+                    });
                 }
                 resolve(image_1);
             };

package/esm/loadImageWithBlob.js

@@ -1,13 +1,26 @@
-import { createObjectURL, revokeObjectURL } from './utils/native.js';
+import { revokeObjectURL, createObjectURL } from './utils/native.js';
 import getFileBlob from './getFileBlob.js';
+import Cache from './utils/Cache.js';
 
-var cacheImage;
-var cacheResult;
-function loadImageWithBlob(img, useCache, ajaxOptions) {
-    if (useCache === void 0) { useCache = true; }
+var cache = new Cache({ max: 1 });
+cache.on('del', function (v) {
+    if (v.r) {
+        try {
+            revokeObjectURL(v.data.image.src);
+        }
+        catch (_a) {
+        }
+    }
+});
+function loadImageWithBlob(img, cacheOptions, ajaxOptions) {
+    if (cacheOptions === void 0) { cacheOptions = true; }
+    var _cacheOptions = {
+        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+    };
     return new Promise(function (resolve, reject) {
-        if (useCache && cacheImage === img && cacheResult) {
-            resolve(cacheResult);
+        if (_cacheOptions.useCache && cache.has(img)) {
+            resolve(cache.get(img).data);
         }
         else {
             getFileBlob(img, ajaxOptions)
@@ -15,11 +28,12 @@ function loadImageWithBlob(img, useCache, ajaxOptions) {
                 var url = createObjectURL(blob);
                 var image = new Image();
                 image.onload = function () {
-                    revokeObjectURL(url);
                     var result = { blob: blob, image: image };
-                    if (useCache) {
-                        cacheImage = img;
-                        cacheResult = result;
+                    if (_cacheOptions.useCache) {
+                        cache.set(img, {
+                            data: result,
+                            r: _cacheOptions.autoRevokeOnDel
+                        });
                     }
                     resolve(result);
                 };

package/esm/node_modules/.pnpm/emitter-pro@1.0.3/node_modules/emitter-pro/dist/emitter-pro.esm.js

@@ -0,0 +1,72 @@
+var EmitterPro = /** @class */ (function () {
+    function EmitterPro() {
+        this.handler = {};
+    }
+    EmitterPro.prototype.eventNames = function () {
+        return Object.keys(this.handler);
+    };
+    EmitterPro.prototype.listeners = function (eventName) {
+        return this.handler[eventName] || [];
+    };
+    EmitterPro.prototype.hasListener = function (eventName, listener) {
+        return this.listeners(eventName).some(function (item) { return item === listener; });
+    };
+    EmitterPro.prototype.on = function (eventName, listener) {
+        if (!this.handler[eventName]) {
+            this.handler[eventName] = [listener];
+        }
+        else {
+            // 不允许添加相同的方法
+            if (!this.hasListener(eventName, listener)) {
+                this.handler[eventName].push(listener);
+            }
+        }
+        return this;
+    };
+    EmitterPro.prototype.off = function (eventName, listener) {
+        if (this.handler[eventName]) {
+            if (typeof listener === 'function') {
+                this.handler[eventName] = this.handler[eventName].filter(function (item) { return item !== listener; });
+            }
+            else {
+                delete this.handler[eventName];
+            }
+        }
+        return this;
+    };
+    EmitterPro.prototype.emit = function (eventName) {
+        var args = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            args[_i - 1] = arguments[_i];
+        }
+        var listeners = this.listeners(eventName);
+        if (listeners.length > 0) {
+            listeners.forEach(function (listener) {
+                // eslint-disable-next-line prefer-spread
+                listener.apply(void 0, args);
+            });
+            return true;
+        }
+        return false;
+    };
+    EmitterPro.prototype.once = function (eventName, listener) {
+        var _this = this;
+        var wrap = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            // eslint-disable-next-line prefer-spread
+            listener.apply(void 0, args);
+            _this.off(eventName, wrap);
+        };
+        return this.on(eventName, wrap);
+    };
+    EmitterPro.prototype.offAll = function () {
+        this.handler = {};
+        return this;
+    };
+    return EmitterPro;
+}());
+
+export { EmitterPro as default };

package/esm/utils/Cache.js

@@ -0,0 +1,47 @@
+import { __extends, __assign } from 'tslib';
+import EmitterPro from '../node_modules/.pnpm/emitter-pro@1.0.3/node_modules/emitter-pro/dist/emitter-pro.esm.js';
+import { forEach } from 'ut2';
+
+var Cache = (function (_super) {
+    __extends(Cache, _super);
+    function Cache(options) {
+        var _this = _super.call(this) || this;
+        _this.data = [];
+        _this.options = __assign({ max: 10 }, options);
+        return _this;
+    }
+    Cache.prototype.has = function (k) {
+        return !!this.data.find(function (item) { return item.k === k; });
+    };
+    Cache.prototype.get = function (k) {
+        var _a;
+        return (_a = this.data.find(function (item) { return item.k === k; })) === null || _a === void 0 ? void 0 : _a.v;
+    };
+    Cache.prototype.checkLimit = function () {
+        var _this = this;
+        if (this.options.max !== 0) {
+            var limit = this.data.length - this.options.max;
+            if (limit >= 0) {
+                var delArr = this.data.splice(0, limit + 1);
+                forEach(delArr, function (item) {
+                    _this.emit('del', item.v, item.k);
+                });
+            }
+        }
+    };
+    Cache.prototype.set = function (k, v) {
+        var newData = { k: k, v: v };
+        if (this.has(k)) {
+            var index = this.data.findIndex(function (item) { return item.k === k; });
+            this.data.splice(index, 1, newData);
+        }
+        else {
+            this.checkLimit();
+            this.data.push(newData);
+        }
+    };
+    return Cache;
+}(EmitterPro));
+var Cache$1 = Cache;
+
+export { Cache$1 as default };

package/lib/VERSION.js

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

package/lib/compressImage.js

@@ -34,7 +34,11 @@ function compressImage(img, options) {
             var numCanvasHeight = ut2.toNumber(typeof canvasHeight === 'function' ? canvasHeight(info, options) : canvasHeight);
             canvas.width = numCanvasWidth || image.width;
             canvas.height = numCanvasHeight || image.height;
-            if (background && background !== 'none') {
+            var bgIsTransparent = background === 'none' || background === 'transparent';
+            if (bgIsTransparent) {
+                ctx.clearRect(0, 0, canvas.width, canvas.height);
+            }
+            else {
                 ctx.fillStyle = background;
                 ctx.fillRect(0, 0, canvas.width, canvas.height);
             }
@@ -46,7 +50,13 @@ function compressImage(img, options) {
             }
             var outOffset = typeof offset === 'function' ? offset(info, options) : offset;
             beforeDraw === null || beforeDraw === void 0 ? void 0 : beforeDraw(info, options);
-            ctx.drawImage(image, internalOffset[0] + ut2.toNumber(outOffset[0]), internalOffset[1] + ut2.toNumber(outOffset[1]), image.width, image.height);
+            var dx = internalOffset[0] + ut2.toNumber(outOffset[0]);
+            var dy = internalOffset[1] + ut2.toNumber(outOffset[1]);
+            ctx.drawImage(image, dx, dy, image.width, image.height);
+            if (type === 'image/png' && bgIsTransparent) {
+                ctx.globalCompositeOperation = 'destination-in';
+                ctx.drawImage(image, dx, dy, image.width, image.height);
+            }
             afterDraw === null || afterDraw === void 0 ? void 0 : afterDraw(info, options);
             if (format === 'blob') {
                 canvasToBlob(canvas, type, numQuality).then(resolve).catch(reject);

package/lib/getImageInfo.js

@@ -5,18 +5,32 @@ 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 cache = new Cache({ max: 1 });
+cache.on('del', function (v) {
+    if (v.r) {
+        try {
+            native.revokeObjectURL(v.data.image.src);
+        }
+        catch (_a) {
+        }
+    }
+});
 function calcContrast(w, h) {
     var n = gcd(w, h);
     return "".concat(divide(ut2.round(w), n), ":").concat(divide(ut2.round(h), n));
 }
-var cacheImage;
-var cacheResult;
-function getImageInfo(img, useCache, ajaxOptions) {
-    if (useCache === void 0) { useCache = true; }
+function getImageInfo(img, cacheOptions, ajaxOptions) {
+    if (cacheOptions === void 0) { cacheOptions = true; }
+    var _cacheOptions = {
+        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+    };
     return new Promise(function (resolve, reject) {
-        if (useCache && cacheImage === img && cacheResult) {
-            resolve(cacheResult);
+        if (_cacheOptions.useCache && cache.has(img)) {
+            resolve(cache.get(img).data);
         }
         else {
             loadImageWithBlob(img, false, ajaxOptions)
@@ -33,9 +47,11 @@ function getImageInfo(img, useCache, ajaxOptions) {
                     image: image,
                     blob: blob
                 };
-                if (useCache) {
-                    cacheImage = img;
-                    cacheResult = result;
+                if (_cacheOptions.useCache) {
+                    cache.set(img, {
+                        data: result,
+                        r: _cacheOptions.autoRevokeOnDel
+                    });
                 }
                 resolve(result);
             })

package/lib/index.js

@@ -66,7 +66,7 @@ var findTreeSelect = require('./findTreeSelect.js');
 var config = require('./utils/config.js');
 var VERSION = require('./VERSION.js');
 
-exports.version = "4.21.0";
+exports.version = "4.21.2";
 
 exports.isMobile = isMobile;
 exports.isTelephone = isTelephone;

package/lib/loadImage.js

@@ -2,14 +2,27 @@
 
 var ut2 = require('ut2');
 var native = require('./utils/native.js');
+var Cache = require('./utils/Cache.js');
 
-var cacheImage;
-var cacheResult;
-function loadImage(img, useCache) {
-    if (useCache === void 0) { useCache = true; }
+var cache = new Cache({ max: 1 });
+cache.on('del', function (v) {
+    if (v.r) {
+        try {
+            native.revokeObjectURL(v.data.src);
+        }
+        catch (_a) {
+        }
+    }
+});
+function loadImage(img, cacheOptions) {
+    if (cacheOptions === void 0) { cacheOptions = true; }
+    var _cacheOptions = {
+        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+    };
     return new Promise(function (resolve, reject) {
-        if (useCache && cacheImage === img && cacheResult) {
-            resolve(cacheResult);
+        if (_cacheOptions.useCache && cache.has(img)) {
+            resolve(cache.get(img).data);
         }
         else {
             var imgIsBlob_1 = ut2.isBlob(img);
@@ -19,12 +32,11 @@ function loadImage(img, useCache) {
                 image_1.crossOrigin = 'anonymous';
             }
             image_1.onload = function () {
-                if (imgIsBlob_1) {
-                    native.revokeObjectURL(url_1);
-                }
-                if (useCache) {
-                    cacheImage = img;
-                    cacheResult = image_1;
+                if (_cacheOptions.useCache) {
+                    cache.set(img, {
+                        data: image_1,
+                        r: _cacheOptions.autoRevokeOnDel
+                    });
                 }
                 resolve(image_1);
             };

package/lib/loadImageWithBlob.js

@@ -2,14 +2,27 @@
 
 var native = require('./utils/native.js');
 var getFileBlob = require('./getFileBlob.js');
+var Cache = require('./utils/Cache.js');
 
-var cacheImage;
-var cacheResult;
-function loadImageWithBlob(img, useCache, ajaxOptions) {
-    if (useCache === void 0) { useCache = true; }
+var cache = new Cache({ max: 1 });
+cache.on('del', function (v) {
+    if (v.r) {
+        try {
+            native.revokeObjectURL(v.data.image.src);
+        }
+        catch (_a) {
+        }
+    }
+});
+function loadImageWithBlob(img, cacheOptions, ajaxOptions) {
+    if (cacheOptions === void 0) { cacheOptions = true; }
+    var _cacheOptions = {
+        useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
+        autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+    };
     return new Promise(function (resolve, reject) {
-        if (useCache && cacheImage === img && cacheResult) {
-            resolve(cacheResult);
+        if (_cacheOptions.useCache && cache.has(img)) {
+            resolve(cache.get(img).data);
         }
         else {
             getFileBlob(img, ajaxOptions)
@@ -17,11 +30,12 @@ function loadImageWithBlob(img, useCache, ajaxOptions) {
                 var url = native.createObjectURL(blob);
                 var image = new Image();
                 image.onload = function () {
-                    native.revokeObjectURL(url);
                     var result = { blob: blob, image: image };
-                    if (useCache) {
-                        cacheImage = img;
-                        cacheResult = result;
+                    if (_cacheOptions.useCache) {
+                        cache.set(img, {
+                            data: result,
+                            r: _cacheOptions.autoRevokeOnDel
+                        });
                     }
                     resolve(result);
                 };

package/lib/node_modules/.pnpm/emitter-pro@1.0.3/node_modules/emitter-pro/dist/emitter-pro.esm.js

@@ -0,0 +1,74 @@
+'use strict';
+
+exports.default = /** @class */ (function () {
+    function EmitterPro() {
+        this.handler = {};
+    }
+    EmitterPro.prototype.eventNames = function () {
+        return Object.keys(this.handler);
+    };
+    EmitterPro.prototype.listeners = function (eventName) {
+        return this.handler[eventName] || [];
+    };
+    EmitterPro.prototype.hasListener = function (eventName, listener) {
+        return this.listeners(eventName).some(function (item) { return item === listener; });
+    };
+    EmitterPro.prototype.on = function (eventName, listener) {
+        if (!this.handler[eventName]) {
+            this.handler[eventName] = [listener];
+        }
+        else {
+            // 不允许添加相同的方法
+            if (!this.hasListener(eventName, listener)) {
+                this.handler[eventName].push(listener);
+            }
+        }
+        return this;
+    };
+    EmitterPro.prototype.off = function (eventName, listener) {
+        if (this.handler[eventName]) {
+            if (typeof listener === 'function') {
+                this.handler[eventName] = this.handler[eventName].filter(function (item) { return item !== listener; });
+            }
+            else {
+                delete this.handler[eventName];
+            }
+        }
+        return this;
+    };
+    EmitterPro.prototype.emit = function (eventName) {
+        var args = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            args[_i - 1] = arguments[_i];
+        }
+        var listeners = this.listeners(eventName);
+        if (listeners.length > 0) {
+            listeners.forEach(function (listener) {
+                // eslint-disable-next-line prefer-spread
+                listener.apply(void 0, args);
+            });
+            return true;
+        }
+        return false;
+    };
+    EmitterPro.prototype.once = function (eventName, listener) {
+        var _this = this;
+        var wrap = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            // eslint-disable-next-line prefer-spread
+            listener.apply(void 0, args);
+            _this.off(eventName, wrap);
+        };
+        return this.on(eventName, wrap);
+    };
+    EmitterPro.prototype.offAll = function () {
+        this.handler = {};
+        return this;
+    };
+    return EmitterPro;
+}());
+
+module.exports = exports.default;

package/lib/utils/Cache.js

@@ -0,0 +1,49 @@
+'use strict';
+
+var tslib = require('tslib');
+var emitterPro_esm = require('../node_modules/.pnpm/emitter-pro@1.0.3/node_modules/emitter-pro/dist/emitter-pro.esm.js');
+var ut2 = require('ut2');
+
+var Cache = (function (_super) {
+    tslib.__extends(Cache, _super);
+    function Cache(options) {
+        var _this = _super.call(this) || this;
+        _this.data = [];
+        _this.options = tslib.__assign({ max: 10 }, options);
+        return _this;
+    }
+    Cache.prototype.has = function (k) {
+        return !!this.data.find(function (item) { return item.k === k; });
+    };
+    Cache.prototype.get = function (k) {
+        var _a;
+        return (_a = this.data.find(function (item) { return item.k === k; })) === null || _a === void 0 ? void 0 : _a.v;
+    };
+    Cache.prototype.checkLimit = function () {
+        var _this = this;
+        if (this.options.max !== 0) {
+            var limit = this.data.length - this.options.max;
+            if (limit >= 0) {
+                var delArr = this.data.splice(0, limit + 1);
+                ut2.forEach(delArr, function (item) {
+                    _this.emit('del', item.v, item.k);
+                });
+            }
+        }
+    };
+    Cache.prototype.set = function (k, v) {
+        var newData = { k: k, v: v };
+        if (this.has(k)) {
+            var index = this.data.findIndex(function (item) { return item.k === k; });
+            this.data.splice(index, 1, newData);
+        }
+        else {
+            this.checkLimit();
+            this.data.push(newData);
+        }
+    };
+    return Cache;
+}(emitterPro_esm));
+var Cache$1 = Cache;
+
+module.exports = Cache$1;