util-helpers 5.7.2 → 5.7.3

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.
package/esm/VERSION.js CHANGED
@@ -1,3 +1,3 @@
1
- var VERSION = "5.7.2";
1
+ var VERSION = "5.7.3";
2
2
 
3
3
  export { VERSION as default };
@@ -1,43 +1,38 @@
1
- import { __awaiter, __spreadArray, __read, __generator } from 'tslib';
1
+ import { __awaiter, __generator, __spreadArray, __read } from 'tslib';
2
2
 
3
- var checkResult = function () {
4
- var args_1 = [];
5
- for (var _i = 0; _i < arguments.length; _i++) {
6
- args_1[_i] = arguments[_i];
3
+ var checkResult = function (fn) {
4
+ var args = [];
5
+ for (var _i = 1; _i < arguments.length; _i++) {
6
+ args[_i - 1] = arguments[_i];
7
7
  }
8
- return __awaiter(void 0, __spreadArray([], __read(args_1), false), void 0, function (fn) {
9
- var _a, ret, _b, _c;
10
- if (fn === void 0) { fn = function () { return true; }; }
11
- var args = [];
12
- for (_a = 1; _a < arguments.length; _a++) {
13
- args[_a - 1] = arguments[_a];
14
- }
15
- return __generator(this, function (_e) {
16
- switch (_e.label) {
8
+ return __awaiter(void 0, void 0, void 0, function () {
9
+ var ret, _a, _b;
10
+ return __generator(this, function (_d) {
11
+ switch (_d.label) {
17
12
  case 0:
18
- _e.trys.push([0, 7, , 8]);
13
+ _d.trys.push([0, 7, , 8]);
19
14
  if (!(fn instanceof Promise)) return [3, 2];
20
15
  return [4, fn];
21
16
  case 1:
22
- _b = _e.sent();
17
+ _a = _d.sent();
23
18
  return [3, 6];
24
19
  case 2:
25
20
  if (!(typeof fn === 'function')) return [3, 4];
26
21
  return [4, fn.apply(void 0, __spreadArray([], __read(args), false))];
27
22
  case 3:
28
- _c = _e.sent();
23
+ _b = _d.sent();
29
24
  return [3, 5];
30
25
  case 4:
31
- _c = fn;
32
- _e.label = 5;
26
+ _b = fn;
27
+ _d.label = 5;
33
28
  case 5:
34
- _b = _c;
35
- _e.label = 6;
29
+ _a = _b;
30
+ _d.label = 6;
36
31
  case 6:
37
- ret = _b;
32
+ ret = _a;
38
33
  return [2, ret !== false];
39
34
  case 7:
40
- _e.sent();
35
+ _d.sent();
41
36
  return [2, false];
42
37
  case 8: return [2];
43
38
  }
package/lib/VERSION.js CHANGED
@@ -1,5 +1,5 @@
1
1
  'use strict';
2
2
 
3
- var VERSION = "5.7.2";
3
+ var VERSION = "5.7.3";
4
4
 
5
5
  module.exports = VERSION;
@@ -2,44 +2,39 @@
2
2
 
3
3
  var tslib = require('tslib');
4
4
 
5
- var checkResult = function () {
6
- var args_1 = [];
7
- for (var _i = 0; _i < arguments.length; _i++) {
8
- args_1[_i] = arguments[_i];
5
+ var checkResult = function (fn) {
6
+ var args = [];
7
+ for (var _i = 1; _i < arguments.length; _i++) {
8
+ args[_i - 1] = arguments[_i];
9
9
  }
10
- return tslib.__awaiter(void 0, tslib.__spreadArray([], tslib.__read(args_1), false), void 0, function (fn) {
11
- var _a, ret, _b, _c;
12
- if (fn === void 0) { fn = function () { return true; }; }
13
- var args = [];
14
- for (_a = 1; _a < arguments.length; _a++) {
15
- args[_a - 1] = arguments[_a];
16
- }
17
- return tslib.__generator(this, function (_e) {
18
- switch (_e.label) {
10
+ return tslib.__awaiter(void 0, void 0, void 0, function () {
11
+ var ret, _a, _b;
12
+ return tslib.__generator(this, function (_d) {
13
+ switch (_d.label) {
19
14
  case 0:
20
- _e.trys.push([0, 7, , 8]);
15
+ _d.trys.push([0, 7, , 8]);
21
16
  if (!(fn instanceof Promise)) return [3, 2];
22
17
  return [4, fn];
23
18
  case 1:
24
- _b = _e.sent();
19
+ _a = _d.sent();
25
20
  return [3, 6];
26
21
  case 2:
27
22
  if (!(typeof fn === 'function')) return [3, 4];
28
23
  return [4, fn.apply(void 0, tslib.__spreadArray([], tslib.__read(args), false))];
29
24
  case 3:
30
- _c = _e.sent();
25
+ _b = _d.sent();
31
26
  return [3, 5];
32
27
  case 4:
33
- _c = fn;
34
- _e.label = 5;
28
+ _b = fn;
29
+ _d.label = 5;
35
30
  case 5:
36
- _b = _c;
37
- _e.label = 6;
31
+ _a = _b;
32
+ _d.label = 6;
38
33
  case 6:
39
- ret = _b;
34
+ ret = _a;
40
35
  return [2, ret !== false];
41
36
  case 7:
42
- _e.sent();
37
+ _d.sent();
43
38
  return [2, false];
44
39
  case 8: return [2];
45
40
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "util-helpers",
3
- "version": "5.7.2",
3
+ "version": "5.7.3",
4
4
  "description": "一个基于业务场景的工具方法库",
5
5
  "main": "lib/index.js",
6
6
  "module": "esm/index.js",
@@ -1,34 +1,45 @@
1
+ interface CheckResult {
2
+ <P extends any[]>(fn: (...args: P) => Promise<any>, ...args: P): Promise<boolean>;
3
+ <P extends any[]>(fn: (...args: P) => any, ...args: P): Promise<boolean>;
4
+ (value: any): Promise<boolean>;
5
+ }
1
6
  /**
2
- * 检查函数执行结果。
7
+ * 检查函数执行/值的结果。
3
8
  *
4
- * 如果函数执行异常或返回下列结果,则返回 `false` ,否则返回 `true`。
9
+ * 如果参数是函数,将立即执行,执行异常或返回下列结果(异步会等待结果),则返回 `false` ,否则返回 `true`。
5
10
  * 1. `Promise.reject()`
6
11
  * 2. `Promise.resolve(false)`
7
12
  * 3. `false`
8
13
  *
14
+ * 如果参数是 `Promise`,等待异步返回为下列结果,则返回 `false` ,否则返回 `true`。
15
+ * 1. `reject()`
16
+ * 2. `false`
17
+ *
18
+ * 如果参数是其他类型(非函数或 `Promise`)且等于 `false`,则返回 `false`,否则返回 `true`。
19
+ *
9
20
  * @alias module:Other.checkResult
10
21
  * @since 5.5.0
11
- * @param {Function} [fn=()=>true] 处理函数,默认 `()=>true`。
22
+ * @param {Function} [fn] 处理函数,默认 `()=>true`。
12
23
  * @param {...*} [args] 展开参数,`fn` 执行参数。
13
24
  * @returns {Promise<boolean>}
14
25
  * @example
15
- * await checkResult(()=>throw new Error()); // false
16
- * await checkResult(()=>Promise.reject()); // false
17
- * await checkResult(()=>Promise.resolve(false)); // false
18
- * await checkResult(async ()=>false); // false
19
- * await checkResult(()=>false); // false
26
+ * await checkResult(() => throw new Error()); // false
27
+ * await checkResult(() => Promise.reject()); // false
28
+ * await checkResult(() => Promise.resolve(false)); // false
29
+ * await checkResult(async () => false); // false
30
+ * await checkResult(() => false); // false
20
31
  *
21
- * await checkResult(undefined); // true
22
- * await checkResult(()=>true); // true
23
- * await checkResult(()=>Promise.resolve()); // true
24
- * await checkResult(async ()=>true); // true
25
- * await checkResult(()=>null); // true
26
- * await checkResult(()=>undefined); // true
27
- * await checkResult(()=>'foo'); // true
32
+ * await checkResult(undefined); // true
33
+ * await checkResult(() => true); // true
34
+ * await checkResult(() => Promise.resolve()); // true
35
+ * await checkResult(async () => true); // true
36
+ * await checkResult(() => null); // true
37
+ * await checkResult(() => undefined); // true
38
+ * await checkResult(() => 'foo'); // true
28
39
  *
29
40
  * // 传入参数
30
- * await checkResult((...args)=>args.length > 1); // false
31
- * await checkResult((...args)=>args.length > 1, 'a', 'b'); // true
41
+ * await checkResult((...args) => args.length > 1); // false
42
+ * await checkResult((...args) => args.length > 1, 'a', 'b'); // true
32
43
  */
33
- declare const checkResult: <P extends any[]>(fn?: (...args: P) => any | Promise<any>, ...args: P) => Promise<boolean>;
44
+ declare const checkResult: CheckResult;
34
45
  export default checkResult;