util-helpers 4.20.8 → 4.21.1

package/esm/VERSION.js

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

package/esm/compressImage.js

@@ -44,7 +44,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') {
+                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/getFileBlob.js

@@ -0,0 +1,32 @@
+import { __assign } from 'tslib';
+import { isBlob } from 'ut2';
+import ajax from './ajax.js';
+
+var SuccessResponseStatus = [200, 304];
+function getFileBlob(file, ajaxOptions) {
+    return new Promise(function (resolve, reject) {
+        if (isBlob(file)) {
+            resolve(file);
+        }
+        else {
+            ajax(file, __assign({ responseType: 'blob' }, ajaxOptions))
+                .then(function (ev) {
+                var responseStatus = ev.target.status;
+                if (SuccessResponseStatus.indexOf(responseStatus) !== -1) {
+                    resolve(ev.target.response);
+                }
+                else {
+                    var err = new Error("The file does not support get requests, responseStatus ".concat(responseStatus, ", '").concat(file, "'."));
+                    console.error(err);
+                    reject(err);
+                }
+            })
+                .catch(function (err) {
+                console.error(new Error("Failed to request file. ".concat(err)));
+                reject(err);
+            });
+        }
+    });
+}
+
+export { getFileBlob as default };

package/esm/index.js

@@ -46,6 +46,7 @@ export { default as ajax } from './ajax.js';
 export { default as calculateCursorPosition } from './calculateCursorPosition.js';
 export { default as compressImage } from './compressImage.js';
 export { default as download } from './download.js';
+export { default as getFileBlob } from './getFileBlob.js';
 export { default as getImageInfo } from './getImageInfo.js';
 export { default as loadImage } from './loadImage.js';
 export { default as loadImageWithBlob } from './loadImageWithBlob.js';
@@ -63,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.20.8";
+var version = "4.21.1";
 
 export { version };

package/esm/loadImage.js

@@ -17,9 +17,6 @@ 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;

package/esm/loadImageWithBlob.js

@@ -1,34 +1,6 @@
-import { __assign } from 'tslib';
-import { isBlob } from 'ut2';
-import ajax from './ajax.js';
 import { createObjectURL, revokeObjectURL } from './utils/native.js';
+import getFileBlob from './getFileBlob.js';
 
-var SuccessResponseStatus = [200, 304];
-function getBlob(img, ajaxOptions) {
-    return new Promise(function (resolve, reject) {
-        if (isBlob(img)) {
-            resolve(img);
-        }
-        else {
-            ajax(img, __assign({ responseType: 'blob' }, ajaxOptions))
-                .then(function (ev) {
-                var responseStatus = ev.target.status;
-                if (SuccessResponseStatus.indexOf(responseStatus) !== -1) {
-                    resolve(ev.target.response);
-                }
-                else {
-                    var err = new Error("[loadImageWithBlob] The image does not support get requests, responseStatus ".concat(responseStatus, ", '").concat(img, "'."));
-                    console.error(err);
-                    reject(err);
-                }
-            })
-                .catch(function (err) {
-                console.error(new Error("[loadImageWithBlob] Failed to request image. ".concat(err)));
-                reject(err);
-            });
-        }
-    });
-}
 var cacheImage;
 var cacheResult;
 function loadImageWithBlob(img, useCache, ajaxOptions) {
@@ -38,12 +10,11 @@ function loadImageWithBlob(img, useCache, ajaxOptions) {
             resolve(cacheResult);
         }
         else {
-            getBlob(img, ajaxOptions)
+            getFileBlob(img, ajaxOptions)
                 .then(function (blob) {
                 var url = createObjectURL(blob);
                 var image = new Image();
                 image.onload = function () {
-                    revokeObjectURL(url);
                     var result = { blob: blob, image: image };
                     if (useCache) {
                         cacheImage = img;

package/lib/VERSION.js

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

package/lib/compressImage.js

@@ -46,7 +46,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') {
+                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/getFileBlob.js

@@ -0,0 +1,34 @@
+'use strict';
+
+var tslib = require('tslib');
+var ut2 = require('ut2');
+var ajax = require('./ajax.js');
+
+var SuccessResponseStatus = [200, 304];
+function getFileBlob(file, ajaxOptions) {
+    return new Promise(function (resolve, reject) {
+        if (ut2.isBlob(file)) {
+            resolve(file);
+        }
+        else {
+            ajax(file, tslib.__assign({ responseType: 'blob' }, ajaxOptions))
+                .then(function (ev) {
+                var responseStatus = ev.target.status;
+                if (SuccessResponseStatus.indexOf(responseStatus) !== -1) {
+                    resolve(ev.target.response);
+                }
+                else {
+                    var err = new Error("The file does not support get requests, responseStatus ".concat(responseStatus, ", '").concat(file, "'."));
+                    console.error(err);
+                    reject(err);
+                }
+            })
+                .catch(function (err) {
+                console.error(new Error("Failed to request file. ".concat(err)));
+                reject(err);
+            });
+        }
+    });
+}
+
+module.exports = getFileBlob;

package/lib/index.js

@@ -48,6 +48,7 @@ var ajax = require('./ajax.js');
 var calculateCursorPosition = require('./calculateCursorPosition.js');
 var compressImage = require('./compressImage.js');
 var download = require('./download.js');
+var getFileBlob = require('./getFileBlob.js');
 var getImageInfo = require('./getImageInfo.js');
 var loadImage = require('./loadImage.js');
 var loadImageWithBlob = require('./loadImageWithBlob.js');
@@ -65,7 +66,7 @@ var findTreeSelect = require('./findTreeSelect.js');
 var config = require('./utils/config.js');
 var VERSION = require('./VERSION.js');
 
-exports.version = "4.20.8";
+exports.version = "4.21.1";
 
 exports.isMobile = isMobile;
 exports.isTelephone = isTelephone;
@@ -115,6 +116,7 @@ exports.ajax = ajax;
 exports.calculateCursorPosition = calculateCursorPosition;
 exports.compressImage = compressImage;
 exports.download = download;
+exports.getFileBlob = getFileBlob;
 exports.getImageInfo = getImageInfo;
 exports.loadImage = loadImage;
 exports.loadImageWithBlob = loadImageWithBlob;

package/lib/loadImage.js

@@ -19,9 +19,6 @@ 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;

package/lib/loadImageWithBlob.js

@@ -1,36 +1,8 @@
 'use strict';
 
-var tslib = require('tslib');
-var ut2 = require('ut2');
-var ajax = require('./ajax.js');
 var native = require('./utils/native.js');
+var getFileBlob = require('./getFileBlob.js');
 
-var SuccessResponseStatus = [200, 304];
-function getBlob(img, ajaxOptions) {
-    return new Promise(function (resolve, reject) {
-        if (ut2.isBlob(img)) {
-            resolve(img);
-        }
-        else {
-            ajax(img, tslib.__assign({ responseType: 'blob' }, ajaxOptions))
-                .then(function (ev) {
-                var responseStatus = ev.target.status;
-                if (SuccessResponseStatus.indexOf(responseStatus) !== -1) {
-                    resolve(ev.target.response);
-                }
-                else {
-                    var err = new Error("[loadImageWithBlob] The image does not support get requests, responseStatus ".concat(responseStatus, ", '").concat(img, "'."));
-                    console.error(err);
-                    reject(err);
-                }
-            })
-                .catch(function (err) {
-                console.error(new Error("[loadImageWithBlob] Failed to request image. ".concat(err)));
-                reject(err);
-            });
-        }
-    });
-}
 var cacheImage;
 var cacheResult;
 function loadImageWithBlob(img, useCache, ajaxOptions) {
@@ -40,12 +12,11 @@ function loadImageWithBlob(img, useCache, ajaxOptions) {
             resolve(cacheResult);
         }
         else {
-            getBlob(img, ajaxOptions)
+            getFileBlob(img, ajaxOptions)
                 .then(function (blob) {
                 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.20.8",
+  "version": "4.21.1",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -92,5 +92,8 @@
   "dependencies": {
     "tslib": "^2.6.2",
     "ut2": "^1.5.2"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
   }
 }

package/types/getFileBlob.d.ts

@@ -0,0 +1,22 @@
+import ajax from './ajax';
+/**
+ * 获取文件 Blob 。
+ *
+ * @static
+ * @alias module:Other.getFileBlob
+ * @since 4.21.0
+ * @param {string | Blob} file 文件地址或对象。
+ * @param {AjaxOptions} [ajaxOptions] ajax 请求配置项，当传入的图片为字符串时才会触发请求。
+ * @returns {Promise<Blob>} 文件 Blob 。
+ * @example
+ *
+ * getFileBlob(file).then((blob)=>{
+ *    // do something
+ * });
+ *
+ * getFileBlob('https://dummyimage.com/200x300').then((blob)=>{
+ *   // do something
+ * });
+ */
+declare function getFileBlob(file: string | Blob, ajaxOptions?: Parameters<typeof ajax>[1]): Promise<Blob>;
+export default getFileBlob;

package/types/getImageInfo.d.ts

@@ -4,6 +4,8 @@ import loadImageWithBlob from './loadImageWithBlob';
  *
  * <em style="font-weight: bold;">注意：该方法仅适用于浏览器端。</em>
  *
+ * <em style="font-weight: bold;">如果不需要该图片，建议手动调用 `URL.revokeObjectURL(image.src)` 释放缓存。</em>
+ *
  * @static
  * @alias module:Other.getImageInfo
  * @since 4.20.0

package/types/index.d.ts

@@ -103,6 +103,7 @@ export { default as ajax } from './ajax';
 export { default as calculateCursorPosition } from './calculateCursorPosition';
 export { default as compressImage } from './compressImage';
 export { default as download } from './download';
+export { default as getFileBlob } from './getFileBlob';
 export { default as getImageInfo } from './getImageInfo';
 export { default as loadImage } from './loadImage';
 export { default as loadImageWithBlob } from './loadImageWithBlob';

package/types/loadImage.d.ts

@@ -3,6 +3,8 @@
  *
  * <em style="font-weight: bold;">注意：该方法仅适用于浏览器端。</em>
  *
+ * <em style="font-weight: bold;">如果不需要该图片，建议手动调用 `URL.revokeObjectURL(image.src)` 释放缓存。</em>
+ *
  * @static
  * @alias module:Other.loadImage
  * @since 4.20.0

package/types/loadImageWithBlob.d.ts

@@ -1,4 +1,4 @@
-import ajax from './ajax';
+import getFileBlob from './getFileBlob';
 /**
  * @typedef {Object} ImageWithBlob HTML图片元素和 blob 对象
  * @property {HTMLImageElement} image HTML图片元素
@@ -9,6 +9,8 @@ import ajax from './ajax';
  *
  * <em style="font-weight: bold;">注意：该方法仅适用于浏览器端。</em>
  *
+ * <em style="font-weight: bold;">如果不需要该图片，建议手动调用 `URL.revokeObjectURL(image.src)` 释放缓存。</em>
+ *
  * @method
  * @alias module:Other.loadImageWithBlob
  * @since 4.20.0
@@ -31,7 +33,7 @@ import ajax from './ajax';
  * });
  *
  */
-declare function loadImageWithBlob(img: string | Blob, useCache?: boolean, ajaxOptions?: Parameters<typeof ajax>[1]): Promise<{
+declare function loadImageWithBlob(img: string | Blob, useCache?: boolean, ajaxOptions?: Parameters<typeof getFileBlob>[1]): Promise<{
     image: HTMLImageElement;
     blob: Blob;
 }>;