util-helpers 5.6.0 → 5.7.1

package/esm/AsyncMemo.js

@@ -1,11 +1,12 @@
 import { __assign } from 'tslib';
 import { Cache } from 'cache2';
-import { isString, uniqueId } from 'ut2';
+import { isString } from 'ut2';
 
 var AsyncMemo = (function () {
-    function AsyncMemo(options) {
+    function AsyncMemo(options, ns) {
+        if (ns === void 0) { ns = 'uh_async_memo'; }
         this.promiseCache = {};
-        this.cache = new Cache(uniqueId('uh_async_memo'), options);
+        this.cache = new Cache(ns, options);
     }
     AsyncMemo.prototype.run = function (asyncFn, key, options) {
         var _this = this;

package/esm/VERSION.js

@@ -1,3 +1,3 @@
-var VERSION = "5.6.0";
+var VERSION = "5.7.1";
 
 export { VERSION as default };

package/esm/ajax.js

@@ -42,7 +42,7 @@ function ajax(url, options) {
             loadend: onLoadEnd
         };
         var eventKeys = objectKeys(events);
-        eventKeys.map(function (item) {
+        eventKeys.forEach(function (item) {
             var func = events[item];
             if (func) {
                 xhr.addEventListener(item, func);

package/esm/divide.js

@@ -1,5 +1,5 @@
 import { isNaN } from 'ut2';
-import { transformEffectiveNumber, float2Fixed, checkBoundary, strip, digitLength } from './utils/math.util.js';
+import { transformEffectiveNumber, float2Fixed, strip, digitLength, checkBoundary } from './utils/math.util.js';
 import times from './times.js';
 
 function divide() {

package/esm/getFileType.js

@@ -3,7 +3,7 @@ import checkFileType from './checkFileType.js';
 import { isUploadFile } from './utils/file.util.js';
 
 var config = {
-    image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp,.svg,.apng,.avif,.ico,.tif,.tiff',
+    image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp,.svg,.apng,.avif,.ico,.cur,.tif,.tiff,.jfif,.pjpeg,.pjp',
     audio: 'audio/*,.mp3,.wav,.aac,.flac',
     video: 'video/*,.mp4,.webm,.ogg,.mov',
     pdf: 'application/pdf,.pdf',

package/lib/AsyncMemo.js

@@ -5,9 +5,10 @@ var cache2 = require('cache2');
 var ut2 = require('ut2');
 
 var AsyncMemo = (function () {
-    function AsyncMemo(options) {
+    function AsyncMemo(options, ns) {
+        if (ns === void 0) { ns = 'uh_async_memo'; }
         this.promiseCache = {};
-        this.cache = new cache2.Cache(ut2.uniqueId('uh_async_memo'), options);
+        this.cache = new cache2.Cache(ns, options);
     }
     AsyncMemo.prototype.run = function (asyncFn, key, options) {
         var _this = this;

package/lib/VERSION.js

@@ -1,5 +1,5 @@
 'use strict';
 
-var VERSION = "5.6.0";
+var VERSION = "5.7.1";
 
 module.exports = VERSION;

package/lib/ajax.js

@@ -44,7 +44,7 @@ function ajax(url, options) {
             loadend: onLoadEnd
         };
         var eventKeys = native.objectKeys(events);
-        eventKeys.map(function (item) {
+        eventKeys.forEach(function (item) {
             var func = events[item];
             if (func) {
                 xhr.addEventListener(item, func);

package/lib/getFileType.js

@@ -5,7 +5,7 @@ var checkFileType = require('./checkFileType.js');
 var file_util = require('./utils/file.util.js');
 
 var config = {
-    image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp,.svg,.apng,.avif,.ico,.tif,.tiff',
+    image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp,.svg,.apng,.avif,.ico,.cur,.tif,.tiff,.jfif,.pjpeg,.pjp',
     audio: 'audio/*,.mp3,.wav,.aac,.flac',
     video: 'video/*,.mp4,.webm,.ogg,.mov',
     pdf: 'application/pdf,.pdf',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "5.6.0",
+  "version": "5.7.1",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -71,10 +71,10 @@
     "jest-environment-jsdom": "^29.7.0",
     "jsdoc": "^4.0.4",
     "lint-staged": "^13.3.0",
-    "prettier": "^3.4.2",
-    "rollup": "^4.28.1",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.7.2"
+    "prettier": "^3.5.3",
+    "rollup": "^4.36.0",
+    "ts-jest": "^29.2.6",
+    "typescript": "^5.8.2"
   },
   "lint-staged": {
     "**/*.ts": "eslint",
@@ -88,7 +88,7 @@
   "dependencies": {
     "cache2": "^3.1.2",
     "tslib": "^2.8.1",
-    "ut2": "^1.15.0"
+    "ut2": "^1.17.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/types/AsyncMemo.d.ts

@@ -9,18 +9,24 @@ import { Cache, CacheOptions } from 'cache2';
  *
  * @class
  * @see {@link https://www.npmjs.com/package/cache2 cache2}
- * @param {Object} [options] 缓存配置项，更多配置项可参考 [`cache2`](https://www.npmjs.com/package/cache2)
- * @param {number} [options.max] 最大缓存数量
- * @param {'replaced' | 'limited'} [options.maxStrategy] 缓存策略
+ * @param {Object} [options] 缓存配置项，更多配置项可参考 [`cache2`](https://www.npmjs.com/package/cache2)。
+ * @param {number} [options.max] 最大缓存数量。
+ * @param {'replaced' | 'limited'} [options.maxStrategy] 缓存策略。
+ * @param {string} [options.prefix] 缓存健前缀。
+ * @param {string} [ns='uh_async_memo'] 缓存命名空间。默认 `uh_async_memo`。
  * @example
  *
- * const asyncMemo = new AsyncMemo({ max: 20, maxStrategy: 'replaced' });
+ * const asyncMemo = new AsyncMemo({ max: 20, maxStrategy: 'replaced', prefix: 'some key' });
  * asyncMemo.run(()=>download({ fssid: 'a' }), 'a');
  * asyncMemo.run(()=>download({ fssid: 'b' }), 'b');
  * asyncMemo.run(()=>download({ fssid: 'a' }), 'a'); // 如果有缓存结果直接返回，如果有异步执行中，不会重复触发异步，但共享异步结果。
  *
  * asyncMemo.run(()=>download({ fssid: 'a' }), 'a', { persisted: false }); // 不读取缓存结果，但是异步执行结果还是会缓存。
  * asyncMemo.run(()=>download({ fssid: 'a' })); // 没有缓存键时，直接执行异步方法，不读取缓存结果，也不会缓存异步结果。
+ *
+ * // 自定义命名空间
+ * const asyncMemo2 = new AsyncMemo({}, 'namespace');
+ *
  */
 declare class AsyncMemo<DataType = any> {
     private promiseCache;
@@ -28,7 +34,7 @@ declare class AsyncMemo<DataType = any> {
      * @summary cache2 实例，用于管理缓存
      */
     cache: Cache<DataType>;
-    constructor(options?: Partial<CacheOptions>);
+    constructor(options?: Partial<CacheOptions>, ns?: string);
     /**
      * 执行异步方法
      *

package/types/ajax.d.ts

@@ -1,10 +1,11 @@
 type XMLHttpRequestListener = XMLHttpRequest['onloadstart'];
+type DataType = Parameters<XMLHttpRequest['send']>[0];
 type AjaxOptions = {
     method?: string;
     async?: boolean;
     user?: string | null;
     password?: string | null;
-    data?: Parameters<XMLHttpRequest['send']>[0];
+    data?: DataType;
     headers?: Record<string, string>;
     responseType?: XMLHttpRequestResponseType;
     timeout?: number;
@@ -75,6 +76,25 @@ type AjaxOptions = {
  * ajax('/api', { method: 'post' }).then(res=>{
  *   // do something
  * });
+ *
+ * // 中断请求
+ * let xhr: XMLHttpRequest | null = null;
+ * ajax('./download/test.txt', {
+ *   onLoadStart(e) {
+ *     console.log('onLoadStart', e);
+ *     xhr = e.target;
+ *   }
+ * }).finally(() => {
+ *   console.log('finally');
+ *   xhr = null;
+ * });
+ *
+ * if(ABORT_CONDITION){
+ *   if(xhr){
+ *      xhr.abort();
+ *   }
+ * }
+ *
  */
 declare function ajax(url: string, options?: AjaxOptions): Promise<ProgressEvent<EventTarget>>;
 export default ajax;

package/types/getFileType.d.ts

@@ -18,7 +18,7 @@ import { UploadFile } from './utils/file.util';
  *
  * | 类型 | 说明符 |
  * |---|---|
- * | `image` | `image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp,.svg,.apng,.avif,.ico,.tif,.tiff` |
+ * | `image` | `image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp,.svg,.apng,.avif,.ico,.cur,.tif,.tiff,.jfif,.pjpeg,.pjp` |
  * | `audio` | `audio/*,.mp3,.wav,.aac,.flac` |
  * | `video` | `video/*,.mp4,.webm,.ogg,.mov` |
  * | `pdf` | `application/pdf,.pdf` |

package/types/index.d.ts

@@ -55,7 +55,7 @@ export { default as transformObjectValue } from './transformObjectValue';
  * // 以下为有效数值：
  * // 1. 数字: 1, -1, 1e-2, 1.312, 0.1, Infinity
  * // 2. 字符串: '1', '10e2', '-1', '0.1', '', ' ', '  15', ' 15   '
- * // 4. 其他类型: null, new Date(), [], new Array(), true, false,...
+ * // 3. 其他类型: null, new Date(), [], new Array(), true, false,...
  *
  * // 以下为无效数值：
  * // 1. 字符串: '1a', '-12a', '10.2.2', '10e2.1'

package/types/isUnifiedIdentifier.d.ts

@@ -4,6 +4,8 @@ type Options = {
 /**
  * 检测值是否为统一社会信用代码，也叫三证合一组织代码。由18位数字和大写字母组成，不使用I、O、Z、S、V。
  *
+ * 之前版本的方法名为 `isSocialCreditCode` 。
+ *
  * @alias module:Validator.isUnifiedIdentifier
  * @since 5.6.0
  * @see {@link https://zh.wikisource.org/zh-hans/GB_32100-2015_法人和其他组织统一社会信用代码编码规则 GB 32100-2015 法人和其他组织统一社会信用代码编码规则}