util-helpers 4.23.1 → 5.0.0

package/lib/loadImageWithBlob.js

@@ -2,52 +2,25 @@
 
 var native = require('./utils/native.js');
 var getFileBlob = require('./getFileBlob.js');
-var AsyncMemo = require('./AsyncMemo.js');
-var ut2 = require('ut2');
 
-var asyncMemo = new AsyncMemo({ max: 1, maxStrategy: 'replaced' });
-asyncMemo.cache.on('del', function (k, v) {
-    try {
-        if (v.r) {
-            native.revokeObjectURL(v.data.image.src);
-        }
-    }
-    catch (_a) {
-    }
-});
-function loadImageWithBlob(img, cacheOptions, ajaxOptions) {
-    if (cacheOptions === void 0) { cacheOptions = true; }
-    var cacheOptionsIsObject = typeof cacheOptions === 'object';
-    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)
-    };
-    return asyncMemo
-        .run(function () {
-        return new Promise(function (resolve, reject) {
-            getFileBlob(img, ajaxOptions)
-                .then(function (blob) {
-                var url = native.createObjectURL(blob);
-                var image = new Image();
-                image.onload = function () {
-                    var data = { blob: blob, image: image };
-                    resolve({
-                        data: data,
-                        r: _cacheOptions.autoRevokeOnDel
-                    });
-                };
-                image.onerror = function (err) {
-                    native.revokeObjectURL(url);
-                    console.error("[loadImageWithBlob] The image load failed, '".concat(img, "'."));
-                    reject(err);
-                };
-                image.src = url;
-            })
-                .catch(reject);
-        });
-    }, _cacheOptions.useCache && _cacheOptions.cacheKey ? _cacheOptions.cacheKey : undefined)
-        .then(function (res) { return res.data; });
+function loadImageWithBlob(img, ajaxOptions) {
+    return new Promise(function (resolve, reject) {
+        getFileBlob(img, ajaxOptions)
+            .then(function (blob) {
+            var url = native.createObjectURL(blob);
+            var image = new Image();
+            image.onload = function () {
+                resolve({ blob: blob, image: image });
+            };
+            image.onerror = function (err) {
+                native.revokeObjectURL(url);
+                console.error("[loadImageWithBlob] The image load failed, '".concat(img, "'."));
+                reject(err);
+            };
+            image.src = url;
+        })
+            .catch(reject);
+    });
 }
 
 module.exports = loadImageWithBlob;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.23.1",
+  "version": "5.0.0",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",

package/types/compressImage.d.ts

@@ -19,8 +19,7 @@ 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 | Parameters<typeof loadImageWithBlob>[1];
-    ajaxOptions?: Parameters<typeof loadImageWithBlob>[2];
+    ajaxOptions?: Parameters<typeof loadImageWithBlob>[1];
 };
 interface CompressImage {
     (img: string | Blob, options: Omit<Options, 'format'> & {
@@ -54,8 +53,7 @@ interface CompressImage {
  * @param {function} [options.beforeCompress] 图片加载完成，画布创建之前调用
  * @param {function} [options.beforeDraw] 图片载入画布之前调用
  * @param {function} [options.afterDraw] 图片载入画布之后调用
- * @param {boolean | CacheOptions} [options.cacheImage=true] 是否使用 `loadImageWithBlob` 缓存。
- * @param {AjaxOptions} [options.ajaxOptions] ajax 请求配置项，当传入的图片为字符串时才会触发请求。
+ * @param {AjaxOptions} [options.ajaxOptions] ajax 请求配置项，当传入图片地址时才会触发ajax请求。
  * @returns {Promise<Blob | string>} blob 对象 或 data url 图片
  * @example
  *

package/types/formatBankCard.d.ts

@@ -1,6 +1,4 @@
 type Options = {
-    /** @deprecated */
-    char?: string;
     spaceMark?: string;
     length?: number;
 };
@@ -26,7 +24,7 @@ type Options = {
  * // 脱敏银行卡
  * formatBankCard('6228********890'); // 6228 **** **** 890
  *
- * // 16位银行卡，"-"间隔
+ * // 自定义间隔符
  * formatBankCard('6228480402564890', {spaceMark: '-'}); // 6228-4804-0256-4890
  *
  */

package/types/formatMobile.d.ts

@@ -1,6 +1,4 @@
 type Options = {
-    /** @deprecated */
-    char?: string;
     spaceMark?: string;
 };
 /**

package/types/getImageInfo.d.ts

@@ -1,14 +1,4 @@
 import loadImageWithBlob from './loadImageWithBlob';
-type Result = {
-    width: number;
-    height: number;
-    contrast: string;
-    measure: string;
-    size: string;
-    bytes: number;
-    image: HTMLImageElement;
-    blob: Blob;
-};
 /**
  * @typedef {Object} ImageInfo 图片信息
  * @property {number} width 宽度
@@ -29,7 +19,6 @@ type Result = {
  * @alias module:Other.getImageInfo
  * @since 4.20.0
  * @param {string | Blob} img 图片地址或 blob 对象
- * @param {boolean | CacheOptions} [cacheOptions=true] 是否使用缓存。开启后，自动缓存最近上一次成功的结果，当图片地址或 blob 对象一致时，直接返回该缓存。避免连续请求同一个图片资源，重复加载。当缓存下一次成功加载的图片时，会自动释放上一次缓存的图片，也可以通过 `autoRevokeOnDel` 设置不释放缓存。
  * @param {AjaxOptions} [ajaxOptions] ajax 请求配置项，当传入的图片为字符串时才会触发请求。
  * @returns {Promise<ImageInfo>} 图片信息
  * @example
@@ -47,5 +36,14 @@ type Result = {
  * });
  *
  */
-declare function getImageInfo(img: string | Blob, cacheOptions?: boolean | Parameters<typeof loadImageWithBlob>[1], ajaxOptions?: Parameters<typeof loadImageWithBlob>[2]): Promise<Result>;
+declare function getImageInfo(img: string | Blob, ajaxOptions?: Parameters<typeof loadImageWithBlob>[1]): Promise<{
+    width: number;
+    height: number;
+    contrast: string;
+    measure: string;
+    size: string;
+    bytes: number;
+    image: HTMLImageElement;
+    blob: Blob;
+}>;
 export default getImageInfo;

package/types/index.d.ts

@@ -22,7 +22,6 @@ export { default as isIPv6 } from './isIPv6';
 export { default as isUrl } from './isUrl';
 export { default as isBusinessLicense } from './isBusinessLicense';
 export { default as validatePassword } from './validatePassword';
-export { default as isPromiseLike } from './isPromiseLike';
 export { default as isHMCard } from './isHMCard';
 export { default as isTWCard } from './isTWCard';
 export { default as isSwiftCode } from './isSwiftCode';
@@ -39,11 +38,9 @@ export { default as replaceChar } from './replaceChar';
 export { default as numberToChinese } from './numberToChinese';
 export { default as bytesToSize } from './bytesToSize';
 export { default as parseIdCard } from './parseIdCard';
-export { default as blobToDataURL } from './blobToDataURL';
 export { default as fileReader } from './fileReader';
 export { default as dataURLToBlob } from './dataURLToBlob';
 export { default as setDataURLPrefix } from './setDataURLPrefix';
-export { default as normalizeString } from './normalizeString';
 export { default as safeDate } from './safeDate';
 export { default as formatMobile } from './formatMobile';
 export { default as padZero } from './padZero';
@@ -111,7 +108,6 @@ export { default as loadImageWithBlob } from './loadImageWithBlob';
 export { default as loadScript } from './loadScript';
 export { default as randomString } from './randomString';
 export { default as strlen } from './strlen';
-export { default as waitTime } from './waitTime';
 /**
  * 树结构数据查询、过滤、转换等处理方法
  *
@@ -135,8 +131,4 @@ export { default as findTreeSelect } from './findTreeSelect';
 export { setDisableWarning } from './utils/config';
 import VERSION from './VERSION';
 export { VERSION };
-/**
- * @deprecated 即将废弃，请使用 `VERSION`
- */
-export declare const version: string;
 export { default as AsyncMemo } from './AsyncMemo';

package/types/isBusinessLicense.d.ts

@@ -1,6 +1,4 @@
 type Options = {
-    /** @deprecated */
-    loose?: boolean;
     checkCode?: boolean;
 };
 /**

package/types/isSocialCreditCode.d.ts

@@ -1,6 +1,4 @@
 type Options = {
-    /** @deprecated */
-    loose?: boolean;
     checkCode?: boolean;
 };
 /**

package/types/loadImage.d.ts

@@ -1,9 +1,3 @@
-/**
- * @typedef {Object} CacheOptions 缓存配置
- * @property {boolean} [useCache=true] 是否使用缓存
- * @property {boolean} [autoRevokeOnDel=true] 删除时自动释放缓存
- * @property {string} [cacheKey] 缓存键
- */
 /**
  * 加载图片。
  *
@@ -13,7 +7,6 @@
  * @alias module:Other.loadImage
  * @since 4.20.0
  * @param {string | Blob} img 图片地址或 blob 对象
- * @param {boolean | CacheOptions} [cacheOptions=true] 是否使用缓存。开启后，自动缓存最近上一次成功的结果，当图片地址或 blob 对象一致时，直接返回该缓存。避免连续请求同一个图片资源，重复加载。当缓存下一次成功加载的图片时，会自动释放上一次缓存的图片，也可以通过 `autoRevokeOnDel` 设置不释放缓存。
  * @returns {Promise<HTMLImageElement>} HTML图片元素
  * @example
  *
@@ -30,9 +23,5 @@
  * });
  *
  */
-declare function loadImage(img: string | Blob, cacheOptions?: boolean | {
-    useCache?: boolean;
-    cacheKey?: string;
-    autoRevokeOnDel?: boolean;
-}): Promise<HTMLImageElement>;
+declare function loadImage(img: string | Blob): Promise<HTMLImageElement>;
 export default loadImage;

package/types/loadImageWithBlob.d.ts

@@ -1,8 +1,4 @@
 import getFileBlob from './getFileBlob';
-type Result = {
-    image: HTMLImageElement;
-    blob: Blob;
-};
 /**
  * @typedef {Object} ImageWithBlob HTML图片元素和 blob 对象
  * @property {HTMLImageElement} image HTML图片元素
@@ -11,13 +7,14 @@ type Result = {
 /**
  * 加载图片，返回图片元素和 blob 对象。
  *
+ * 如果传入图片地址，将通过 ajax 请求转为 blob 格式。
+ *
  * <em style="font-weight: bold;">注意：该方法仅适用于浏览器端。</em>
  *
  * @method
  * @alias module:Other.loadImageWithBlob
  * @since 4.20.0
  * @param {string | Blob} img 图片地址或 blob 对象
- * @param {boolean | CacheOptions} [cacheOptions=true] 是否使用缓存。开启后，自动缓存最近上一次成功的结果，当图片地址或 blob 对象一致时，直接返回该缓存。避免连续请求同一个图片资源，重复加载。当缓存下一次成功加载的图片时，会自动释放上一次缓存的图片，也可以通过 `autoRevokeOnDel` 设置不释放缓存。
  * @param {AjaxOptions} [ajaxOptions] ajax 请求配置项，当传入的图片为字符串时才会触发请求。
  * @returns {Promise<ImageWithBlob>} HTML图片元素和 blob 对象
  * @example
@@ -35,9 +32,8 @@ type Result = {
  * });
  *
  */
-declare function loadImageWithBlob(img: string | Blob, cacheOptions?: boolean | {
-    useCache?: boolean;
-    cacheKey?: string;
-    autoRevokeOnDel?: boolean;
-}, ajaxOptions?: Parameters<typeof getFileBlob>[1]): Promise<Result>;
+declare function loadImageWithBlob(img: string | Blob, ajaxOptions?: Parameters<typeof getFileBlob>[1]): Promise<{
+    image: HTMLImageElement;
+    blob: Blob;
+}>;
 export default loadImageWithBlob;

package/esm/blobToDataURL.js

@@ -1,7 +0,0 @@
-import fileReader from './fileReader.js';
-
-function blobToDataURL(blob) {
-    return fileReader(blob);
-}
-
-export { blobToDataURL as default };

package/esm/isPromiseLike.js

@@ -1,7 +0,0 @@
-import { isPromiseLike as isPromiseLike$1 } from 'ut2';
-
-function isPromiseLike(obj) {
-    return isPromiseLike$1(obj);
-}
-
-export { isPromiseLike as default };

package/esm/normalizeString.js

@@ -1,7 +0,0 @@
-import { toString } from 'ut2';
-
-function normalizeString(value) {
-    return toString(value);
-}
-
-export { normalizeString as default };

package/esm/waitTime.js

@@ -1,8 +0,0 @@
-import { sleep } from 'ut2';
-
-function waitTime(time) {
-    if (time === void 0) { time = 1000; }
-    return sleep(time);
-}
-
-export { waitTime as default };

package/lib/blobToDataURL.js

@@ -1,9 +0,0 @@
-'use strict';
-
-var fileReader = require('./fileReader.js');
-
-function blobToDataURL(blob) {
-    return fileReader(blob);
-}
-
-module.exports = blobToDataURL;

package/lib/isPromiseLike.js

@@ -1,9 +0,0 @@
-'use strict';
-
-var ut2 = require('ut2');
-
-function isPromiseLike(obj) {
-    return ut2.isPromiseLike(obj);
-}
-
-module.exports = isPromiseLike;

package/lib/normalizeString.js

@@ -1,9 +0,0 @@
-'use strict';
-
-var ut2 = require('ut2');
-
-function normalizeString(value) {
-    return ut2.toString(value);
-}
-
-module.exports = normalizeString;

package/lib/waitTime.js

@@ -1,10 +0,0 @@
-'use strict';
-
-var ut2 = require('ut2');
-
-function waitTime(time) {
-    if (time === void 0) { time = 1000; }
-    return ut2.sleep(time);
-}
-
-module.exports = waitTime;

package/types/blobToDataURL.d.ts

@@ -1,29 +0,0 @@
-/**
- * 将 Blob 或 File 对象转成 data:URL 格式的 Base64 字符串
- *
- * <em style="font-weight: bold;">注意：该方法仅适用于浏览器端。</em>
- *
- * @ignore
- * @static
- * @alias module:Processor.blobToDataURL
- * @since 4.1.0
- * @see {@link https://developer.mozilla.org/zh-CN/docs/Web/API/FileReader/readAsDataURL FileReader.readAsDataURL()}
- * @deprecated 请使用 `fileReader` 方法
- * @param {Blob} blob Blob 或 File 对象
- * @returns {Promise<string>} data:URL 格式的 Base64 字符串。
- * @example
- * const aFileParts = ['<a id="a"><b id="b">hey!</b></a>']; // 一个包含DOMString的数组
- * const htmlBlob = new Blob(aFileParts, { type: 'text/html' }); // 得到 blob
- *
- * blobToDataURL(htmlBlob).then(data=>{
- *   console.log(data); // data:text/html;base64,PGEgaWQ9ImEiPjxiIGlkPSJiIj5oZXkhPC9iPjwvYT4=
- * });
- *
- * const textBlob = new Blob(aFileParts, { type: 'text/plain' });
- *
- * blobToDataURL(textBlob).then(data=>{
- *   console.log(data); // data:text/plain;base64,PGEgaWQ9ImEiPjxiIGlkPSJiIj5oZXkhPC9iPjwvYT4=
- * });
- */
-declare function blobToDataURL(blob: Blob): Promise<string>;
-export default blobToDataURL;

package/types/isPromiseLike.d.ts

@@ -1,19 +0,0 @@
-/**
- * 检测值是否类似Promise对象
- *
- * @ignore
- * @static
- * @alias module:Validator.isPromiseLike
- * @since 3.8.0
- * @deprecated 即将废弃，请使用 `import { isPromiseLike } 'ut2'`
- * @param {*} obj 要检测的值
- * @returns {boolean} 是否类似Promise对象
- * @example
- *
- * isPromiseLike([]); // false
- * isPromiseLike({ then: () => { } }); // true
- * isPromiseLike(Promise.resolve()); // true
- *
- */
-declare function isPromiseLike(obj: any): boolean;
-export default isPromiseLike;

package/types/normalizeString.d.ts

@@ -1,26 +0,0 @@
-/**
- * 规整化字符串。如果值为 undefined 或 null 将转为空字符串，如果值不是字符串类型将转为字符串。
- *
- * @ignore
- * @static
- * @alias module:Processor.normalizeString
- * @since 4.3.0
- * @see {@link https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/String#string_instances String}
- * @deprecated 即将废弃，请使用 `import { toString } 'ut2'`
- * @param {*} value 待处理的值
- * @returns {string} 规整化的值
- * @example
- *
- * normalizeString(); // ''
- * normalizeString(undefined); // ''
- * normalizeString(void 0); // ''
- * normalizeString(null); // ''
- *
- * normalizeString(true); // 'true'
- * normalizeString(NaN); // 'NaN'
- * normalizeString(1); // '1'
- * normalizeString('a'); // 'a'
- *
- */
-declare function normalizeString(value: any): string;
-export default normalizeString;

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;

package/types/waitTime.d.ts

@@ -1,24 +0,0 @@
-/**
- * 等待时间返回 Promise 。常用于异步方法中延时。
- *
- * @ignore
- * @static
- * @alias module:Other.waitTime
- * @since 4.2.0
- * @deprecated 即将废弃，请使用 `import { sleep } from 'ut2'`
- * @param {number} [time=1000] 延时时间，单位毫秒
- * @returns {Promise<void>}
- * @example
- *
- * const test = async ()=>{
- *   await waitTime();
- *   // do something
- * }
- *
- * waitTime(500).then(()=>{
- *   // do something
- * });
- *
- */
-declare function waitTime(time?: number): Promise<void>;
-export default waitTime;