util-helpers 5.7.0 → 5.7.2

package/esm/VERSION.js

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

package/esm/checkResult.js

@@ -1,5 +1,4 @@
 import { __awaiter, __spreadArray, __read, __generator } from 'tslib';
-import { tryit } from 'ut2';
 
 var checkResult = function () {
     var args_1 = [];
@@ -7,18 +6,40 @@ var checkResult = function () {
         args_1[_i] = arguments[_i];
     }
     return __awaiter(void 0, __spreadArray([], __read(args_1), false), void 0, function (fn) {
-        var _a, _b, err, ret;
+        var _a, ret, _b, _c;
         if (fn === void 0) { fn = function () { return true; }; }
         var args = [];
         for (_a = 1; _a < arguments.length; _a++) {
             args[_a - 1] = arguments[_a];
         }
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4, tryit(fn).apply(void 0, __spreadArray([], __read(args), false))];
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    _e.trys.push([0, 7, , 8]);
+                    if (!(fn instanceof Promise)) return [3, 2];
+                    return [4, fn];
                 case 1:
-                    _b = __read.apply(void 0, [_c.sent(), 2]), err = _b[0], ret = _b[1];
-                    return [2, !err && ret !== false];
+                    _b = _e.sent();
+                    return [3, 6];
+                case 2:
+                    if (!(typeof fn === 'function')) return [3, 4];
+                    return [4, fn.apply(void 0, __spreadArray([], __read(args), false))];
+                case 3:
+                    _c = _e.sent();
+                    return [3, 5];
+                case 4:
+                    _c = fn;
+                    _e.label = 5;
+                case 5:
+                    _b = _c;
+                    _e.label = 6;
+                case 6:
+                    ret = _b;
+                    return [2, ret !== false];
+                case 7:
+                    _e.sent();
+                    return [2, false];
+                case 8: return [2];
             }
         });
     });

package/esm/getFileType.js

@@ -3,9 +3,9 @@ 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',
+    video: 'video/*,.mp4,.webm,.ogg,.mov,.mpg,.mpeg,.avi,.mkv,.wmv,.flv,.rm,.rmvb',
     pdf: 'application/pdf,.pdf',
     word: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document,.doc,.docx',
     excel: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,.xls,.xlsx'

package/lib/VERSION.js

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

package/lib/checkResult.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var tslib = require('tslib');
-var ut2 = require('ut2');
 
 var checkResult = function () {
     var args_1 = [];
@@ -9,18 +8,40 @@ var checkResult = function () {
         args_1[_i] = arguments[_i];
     }
     return tslib.__awaiter(void 0, tslib.__spreadArray([], tslib.__read(args_1), false), void 0, function (fn) {
-        var _a, _b, err, ret;
+        var _a, ret, _b, _c;
         if (fn === void 0) { fn = function () { return true; }; }
         var args = [];
         for (_a = 1; _a < arguments.length; _a++) {
             args[_a - 1] = arguments[_a];
         }
-        return tslib.__generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4, ut2.tryit(fn).apply(void 0, tslib.__spreadArray([], tslib.__read(args), false))];
+        return tslib.__generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    _e.trys.push([0, 7, , 8]);
+                    if (!(fn instanceof Promise)) return [3, 2];
+                    return [4, fn];
                 case 1:
-                    _b = tslib.__read.apply(void 0, [_c.sent(), 2]), err = _b[0], ret = _b[1];
-                    return [2, !err && ret !== false];
+                    _b = _e.sent();
+                    return [3, 6];
+                case 2:
+                    if (!(typeof fn === 'function')) return [3, 4];
+                    return [4, fn.apply(void 0, tslib.__spreadArray([], tslib.__read(args), false))];
+                case 3:
+                    _c = _e.sent();
+                    return [3, 5];
+                case 4:
+                    _c = fn;
+                    _e.label = 5;
+                case 5:
+                    _b = _c;
+                    _e.label = 6;
+                case 6:
+                    ret = _b;
+                    return [2, ret !== false];
+                case 7:
+                    _e.sent();
+                    return [2, false];
+                case 8: return [2];
             }
         });
     });

package/lib/getFileType.js

@@ -5,9 +5,9 @@ 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',
+    video: 'video/*,.mp4,.webm,.ogg,.mov,.mpg,.mpeg,.avi,.mkv,.wmv,.flv,.rm,.rmvb',
     pdf: 'application/pdf,.pdf',
     word: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document,.doc,.docx',
     excel: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,.xls,.xlsx'

package/package.json

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

package/types/getFileType.d.ts

@@ -18,9 +18,9 @@ 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` |
+ * | `video` | `video/*,.mp4,.webm,.ogg,.mov,.mpg,.mpeg,.avi,.mkv,.wmv,.flv,.rm,.rmvb` |
  * | `pdf` | `application/pdf,.pdf` |
  * | `word` | `application/vnd.openxmlformats-officedocument.wordprocessingml.document,.doc,.docx` |
  * | `excel` | `application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,.xls,.xlsx` |

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'