util-helpers 4.20.1 → 4.20.3

package/lib/loadImageWithBlob.js

@@ -1,16 +1,18 @@
 'use strict';
 
+var tslib = require('tslib');
 var ut2 = require('ut2');
 var ajax = require('./ajax.js');
+var native = require('./utils/native.js');
 
 var SuccessResponseStatus = [200, 304];
-function getBlob(img) {
+function getBlob(img, ajaxOptions) {
     return new Promise(function (resolve, reject) {
         if (ut2.isBlob(img)) {
             resolve(img);
         }
         else {
-            ajax(img, { responseType: 'blob' })
+            ajax(img, tslib.__assign({ responseType: 'blob', headers: { 'sec-fetch-site': 'none' } }, ajaxOptions))
                 .then(function (ev) {
                 var responseStatus = ev.target.status;
                 if (SuccessResponseStatus.indexOf(responseStatus) !== -1) {
@@ -26,19 +28,19 @@ function getBlob(img) {
 }
 var cacheImage;
 var cacheResult;
-function loadImageWithBlob(img, useCache) {
+function loadImageWithBlob(img, useCache, ajaxOptions) {
     if (useCache === void 0) { useCache = true; }
     return new Promise(function (resolve, reject) {
         if (useCache && cacheImage === img && cacheResult) {
             resolve(cacheResult);
         }
         else {
-            getBlob(img)
+            getBlob(img, ajaxOptions)
                 .then(function (blob) {
-                var url = URL.createObjectURL(blob);
+                var url = native.createObjectURL(blob);
                 var image = new Image();
                 image.onload = function () {
-                    URL.revokeObjectURL(url);
+                    native.revokeObjectURL(url);
                     var result = { blob: blob, image: image };
                     if (useCache) {
                         cacheImage = img;
@@ -47,7 +49,7 @@ function loadImageWithBlob(img, useCache) {
                     resolve(result);
                 };
                 image.onerror = function (err) {
-                    URL.revokeObjectURL(url);
+                    native.revokeObjectURL(url);
                     console.error("[loadImageWithBlob] The image load failed, '".concat(img, "'."));
                     reject(err);
                 };

package/lib/loadScript.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var tslib = require('tslib');
+var native = require('./utils/native.js');
 
 function loadScript(src, options) {
     return new Promise(function (resolve, reject) {
@@ -15,7 +16,7 @@ function loadScript(src, options) {
             script[key] = props[key];
         }
         if (typeof attrs === 'object') {
-            Object.keys(attrs).forEach(function (key) {
+            native.objectKeys(attrs).forEach(function (key) {
                 script.setAttribute(key, attrs[key]);
             });
         }

package/lib/transformFieldNames.js

@@ -2,10 +2,11 @@
 
 var tslib = require('tslib');
 var ut2 = require('ut2');
+var native = require('./utils/native.js');
 
 function transformFieldNames(data, fieldNames, childrenField, nodeAssign) {
     if (nodeAssign === void 0) { nodeAssign = 'spread'; }
-    if (!Array.isArray(data)) {
+    if (!ut2.isArray(data)) {
         return data;
     }
     if (data.length <= 0) {
@@ -18,10 +19,10 @@ function transformFieldNames(data, fieldNames, childrenField, nodeAssign) {
             }
             var newItem = nodeAssign === 'spread' ? tslib.__assign({}, item) : item;
             var delKeys = [];
-            if (childrenField && Array.isArray(newItem[childrenField]) && newItem[childrenField].length > 0) {
+            if (childrenField && ut2.isArray(newItem[childrenField]) && newItem[childrenField].length > 0) {
                 newItem[childrenField] = recusion(newItem[childrenField].slice());
             }
-            Object.keys(fieldNames).forEach(function (newKey) {
+            native.objectKeys(fieldNames).forEach(function (newKey) {
                 var oldKey = fieldNames[newKey];
                 if (oldKey in newItem) {
                     newItem[newKey] = newItem[oldKey];

package/lib/treeToList.js

@@ -5,7 +5,7 @@ var ut2 = require('ut2');
 
 function treeToList(tree, childrenField) {
     var list = [];
-    if (!Array.isArray(tree)) {
+    if (!ut2.isArray(tree)) {
         return list;
     }
     function recusion(arr) {
@@ -14,7 +14,7 @@ function treeToList(tree, childrenField) {
                 var newItem = tslib.__assign({}, item);
                 list.push(newItem);
                 if (newItem[childrenField]) {
-                    if (Array.isArray(newItem[childrenField]) && newItem[childrenField].length > 0) {
+                    if (ut2.isArray(newItem[childrenField]) && newItem[childrenField].length > 0) {
                         recusion(newItem[childrenField]);
                     }
                     delete newItem[childrenField];

package/lib/utils/native.js

@@ -0,0 +1,5 @@
+'use strict';
+
+exports.objectKeys = Object.keys;
+exports.createObjectURL = URL.createObjectURL;
+exports.revokeObjectURL = URL.revokeObjectURL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.20.1",
+  "version": "4.20.3",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -94,6 +94,6 @@
   },
   "dependencies": {
     "tslib": "^2.6.2",
-    "ut2": "^1.4.6"
+    "ut2": "^1.4.8"
   }
 }

package/types/compressImage.d.ts

@@ -1,3 +1,4 @@
+import loadImageWithBlob from './loadImageWithBlob';
 type Info = {
     image: HTMLImageElement;
     blob: Blob;
@@ -9,7 +10,6 @@ type Options = {
     height?: number;
     rotate?: number;
     offset?: [number, number] | ((info: Info, options: Options) => [number, number]);
-    cacheImage?: boolean;
     background?: string;
     canvasWidth?: number | ((info: Info, options: Options) => number);
     canvasHeight?: number | ((info: Info, options: Options) => number);
@@ -19,6 +19,8 @@ type Options = {
     beforeCompress?: (imageWithBlob: Pick<Info, 'image' | 'blob'>, options: Options) => void;
     beforeDraw?: (info: Info, options: Options) => void;
     afterDraw?: (info: Info, options: Options) => void;
+    cacheImage?: boolean;
+    ajaxOptions?: Parameters<typeof loadImageWithBlob>[2];
 };
 declare function compressImage(img: string | Blob, options: Omit<Options, 'format'> & {
     format: 'dataURL';

package/types/getImageInfo.d.ts

@@ -1,3 +1,4 @@
+import loadImageWithBlob from './loadImageWithBlob';
 /**
  * 获取图片信息。
  *
@@ -8,6 +9,7 @@
  * @since 4.20.0
  * @param {string | Blob} img 图片地址或 blob 对象
  * @param {boolean} [useCache=true] 缓存最近一次成功结果，当图片地址或 blob 对象一致时，直接返回该缓存。避免连续请求同一个图片资源，重复加载问题。
+ * @param {AjaxOptions} [ajaxOptions] ajax 请求配置项，当传入的图片为字符串时才会触发请求。
  * @returns {Promise<ImageInfo>} 图片信息
  * @example
  *
@@ -24,7 +26,7 @@
  * });
  *
  */
-declare function getImageInfo(img: string | Blob, useCache?: boolean): Promise<{
+declare function getImageInfo(img: string | Blob, useCache?: boolean, ajaxOptions?: Parameters<typeof loadImageWithBlob>[2]): Promise<{
     width: number;
     height: number;
     contrast: string;

package/types/loadImageWithBlob.d.ts

@@ -1,3 +1,4 @@
+import ajax from './ajax';
 /**
  * @typedef {Object} ImageWithBlob HTML图片元素和 blob 对象
  * @property {HTMLImageElement} image HTML图片元素
@@ -13,6 +14,7 @@
  * @since 4.20.0
  * @param {string | Blob} img 图片地址或 blob 对象
  * @param {boolean} [useCache=true] 缓存最近一次成功结果，当图片地址或 blob 对象一致时，直接返回该缓存。避免连续请求同一个图片资源，重复加载问题。
+ * @param {AjaxOptions} [ajaxOptions] ajax 请求配置项，当传入的图片为字符串时才会触发请求。
  * @returns {Promise<ImageWithBlob>} HTML图片元素和 blob 对象
  * @example
  *
@@ -29,7 +31,7 @@
  * });
  *
  */
-declare function loadImageWithBlob(img: string | Blob, useCache?: boolean): Promise<{
+declare function loadImageWithBlob(img: string | Blob, useCache?: boolean, ajaxOptions?: Parameters<typeof ajax>[1]): Promise<{
     image: HTMLImageElement;
     blob: Blob;
 }>;

package/types/utils/native.d.ts

@@ -0,0 +1,6 @@
+export declare const objectKeys: {
+    (o: object): string[];
+    (o: {}): string[];
+};
+export declare const createObjectURL: (obj: Blob | MediaSource) => string;
+export declare const revokeObjectURL: (url: string) => void;