util-helpers 5.7.1 → 5.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/util-helpers.js +30 -33
  2. package/dist/util-helpers.js.map +1 -1
  3. package/dist/util-helpers.min.js +1 -1
  4. package/dist/util-helpers.min.js.map +1 -1
  5. package/esm/VERSION.js +1 -1
  6. package/esm/checkResult.js +28 -7
  7. package/esm/getFileType.js +1 -1
  8. package/lib/VERSION.js +1 -1
  9. package/lib/checkResult.js +28 -7
  10. package/lib/getFileType.js +1 -1
  11. package/package.json +1 -1
  12. package/types/getFileType.d.ts +1 -1
package/esm/VERSION.js CHANGED
@@ -1,3 +1,3 @@
1
- var VERSION = "5.7.1";
1
+ var VERSION = "5.7.2";
2
2
 
3
3
  export { VERSION as default };
package/esm/checkResult.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import { __awaiter, __spreadArray, __read, __generator } from 'tslib';
2
- import { tryit } from 'ut2';
3
2
 
4
3
  var checkResult = function () {
5
4
  var args_1 = [];
@@ -7,18 +6,40 @@ var checkResult = function () {
7
6
  args_1[_i] = arguments[_i];
8
7
  }
9
8
  return __awaiter(void 0, __spreadArray([], __read(args_1), false), void 0, function (fn) {
10
- var _a, _b, err, ret;
9
+ var _a, ret, _b, _c;
11
10
  if (fn === void 0) { fn = function () { return true; }; }
12
11
  var args = [];
13
12
  for (_a = 1; _a < arguments.length; _a++) {
14
13
  args[_a - 1] = arguments[_a];
15
14
  }
16
- return __generator(this, function (_c) {
17
- switch (_c.label) {
18
- case 0: return [4, tryit(fn).apply(void 0, __spreadArray([], __read(args), false))];
15
+ return __generator(this, function (_e) {
16
+ switch (_e.label) {
17
+ case 0:
18
+ _e.trys.push([0, 7, , 8]);
19
+ if (!(fn instanceof Promise)) return [3, 2];
20
+ return [4, fn];
19
21
  case 1:
20
- _b = __read.apply(void 0, [_c.sent(), 2]), err = _b[0], ret = _b[1];
21
- return [2, !err && ret !== false];
22
+ _b = _e.sent();
23
+ return [3, 6];
24
+ case 2:
25
+ if (!(typeof fn === 'function')) return [3, 4];
26
+ return [4, fn.apply(void 0, __spreadArray([], __read(args), false))];
27
+ case 3:
28
+ _c = _e.sent();
29
+ return [3, 5];
30
+ case 4:
31
+ _c = fn;
32
+ _e.label = 5;
33
+ case 5:
34
+ _b = _c;
35
+ _e.label = 6;
36
+ case 6:
37
+ ret = _b;
38
+ return [2, ret !== false];
39
+ case 7:
40
+ _e.sent();
41
+ return [2, false];
42
+ case 8: return [2];
22
43
  }
23
44
  });
24
45
  });
package/esm/getFileType.js CHANGED
@@ -5,7 +5,7 @@ import { isUploadFile } from './utils/file.util.js';
5
5
  var config = {
6
6
  image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp,.svg,.apng,.avif,.ico,.cur,.tif,.tiff,.jfif,.pjpeg,.pjp',
7
7
  audio: 'audio/*,.mp3,.wav,.aac,.flac',
8
- video: 'video/*,.mp4,.webm,.ogg,.mov',
8
+ video: 'video/*,.mp4,.webm,.ogg,.mov,.mpg,.mpeg,.avi,.mkv,.wmv,.flv,.rm,.rmvb',
9
9
  pdf: 'application/pdf,.pdf',
10
10
  word: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document,.doc,.docx',
11
11
  excel: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,.xls,.xlsx'
package/lib/VERSION.js CHANGED
@@ -1,5 +1,5 @@
1
1
  'use strict';
2
2
 
3
- var VERSION = "5.7.1";
3
+ var VERSION = "5.7.2";
4
4
 
5
5
  module.exports = VERSION;
package/lib/checkResult.js CHANGED
@@ -1,7 +1,6 @@
1
1
  'use strict';
2
2
 
3
3
  var tslib = require('tslib');
4
- var ut2 = require('ut2');
5
4
 
6
5
  var checkResult = function () {
7
6
  var args_1 = [];
@@ -9,18 +8,40 @@ var checkResult = function () {
9
8
  args_1[_i] = arguments[_i];
10
9
  }
11
10
  return tslib.__awaiter(void 0, tslib.__spreadArray([], tslib.__read(args_1), false), void 0, function (fn) {
12
- var _a, _b, err, ret;
11
+ var _a, ret, _b, _c;
13
12
  if (fn === void 0) { fn = function () { return true; }; }
14
13
  var args = [];
15
14
  for (_a = 1; _a < arguments.length; _a++) {
16
15
  args[_a - 1] = arguments[_a];
17
16
  }
18
- return tslib.__generator(this, function (_c) {
19
- switch (_c.label) {
20
- case 0: return [4, ut2.tryit(fn).apply(void 0, tslib.__spreadArray([], tslib.__read(args), false))];
17
+ return tslib.__generator(this, function (_e) {
18
+ switch (_e.label) {
19
+ case 0:
20
+ _e.trys.push([0, 7, , 8]);
21
+ if (!(fn instanceof Promise)) return [3, 2];
22
+ return [4, fn];
21
23
  case 1:
22
- _b = tslib.__read.apply(void 0, [_c.sent(), 2]), err = _b[0], ret = _b[1];
23
- return [2, !err && ret !== false];
24
+ _b = _e.sent();
25
+ return [3, 6];
26
+ case 2:
27
+ if (!(typeof fn === 'function')) return [3, 4];
28
+ return [4, fn.apply(void 0, tslib.__spreadArray([], tslib.__read(args), false))];
29
+ case 3:
30
+ _c = _e.sent();
31
+ return [3, 5];
32
+ case 4:
33
+ _c = fn;
34
+ _e.label = 5;
35
+ case 5:
36
+ _b = _c;
37
+ _e.label = 6;
38
+ case 6:
39
+ ret = _b;
40
+ return [2, ret !== false];
41
+ case 7:
42
+ _e.sent();
43
+ return [2, false];
44
+ case 8: return [2];
24
45
  }
25
46
  });
26
47
  });
package/lib/getFileType.js CHANGED
@@ -7,7 +7,7 @@ var file_util = require('./utils/file.util.js');
7
7
  var config = {
8
8
  image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp,.svg,.apng,.avif,.ico,.cur,.tif,.tiff,.jfif,.pjpeg,.pjp',
9
9
  audio: 'audio/*,.mp3,.wav,.aac,.flac',
10
- video: 'video/*,.mp4,.webm,.ogg,.mov',
10
+ video: 'video/*,.mp4,.webm,.ogg,.mov,.mpg,.mpeg,.avi,.mkv,.wmv,.flv,.rm,.rmvb',
11
11
  pdf: 'application/pdf,.pdf',
12
12
  word: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document,.doc,.docx',
13
13
  excel: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,.xls,.xlsx'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "util-helpers",
3
- "version": "5.7.1",
3
+ "version": "5.7.2",
4
4
  "description": "一个基于业务场景的工具方法库",
5
5
  "main": "lib/index.js",
6
6
  "module": "esm/index.js",
package/types/getFileType.d.ts CHANGED
@@ -20,7 +20,7 @@ import { UploadFile } from './utils/file.util';
20
20
  * |---|---|
21
21
  * | `image` | `image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp,.svg,.apng,.avif,.ico,.cur,.tif,.tiff,.jfif,.pjpeg,.pjp` |
22
22
  * | `audio` | `audio/*,.mp3,.wav,.aac,.flac` |
23
- * | `video` | `video/*,.mp4,.webm,.ogg,.mov` |
23
+ * | `video` | `video/*,.mp4,.webm,.ogg,.mov,.mpg,.mpeg,.avi,.mkv,.wmv,.flv,.rm,.rmvb` |
24
24
  * | `pdf` | `application/pdf,.pdf` |
25
25
  * | `word` | `application/vnd.openxmlformats-officedocument.wordprocessingml.document,.doc,.docx` |
26
26
  * | `excel` | `application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,.xls,.xlsx` |