@daysnap/utils 0.0.70 → 0.0.72

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.
@@ -7,4 +7,4 @@ import { Loose } from '@daysnap/types';
7
7
  */
8
8
  export declare function createWithLoading<O = any>(showLoading: (options: O) => Loose<{
9
9
  close: () => any;
10
- }>): <T extends (...args: any[]) => Promise<any>>(fn: T, options?: O) => (...params: [...Parameters<T>, (O | undefined)?]) => Promise<Awaited<ReturnType<T>>>;
10
+ }>, defaultOptions?: O): <T extends (...args: any[]) => Promise<any>>(fn: T, options?: O) => (...params: [...Parameters<T>, (O | undefined)?]) => Promise<Awaited<ReturnType<T>>>;
@@ -13,15 +13,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
13
13
  * const fn = withLoading(async () => { // ... })
14
14
  * fn() 执行的时候就会执行showLoading
15
15
  */
16
- export function createWithLoading(showLoading) {
17
- return function withLoading(fn, options) {
16
+ export function createWithLoading(showLoading, defaultOptions) {
17
+ return function withLoading(fn, options = defaultOptions) {
18
18
  return (...params) => __awaiter(this, void 0, void 0, function* () {
19
19
  if (params.length > fn.length) {
20
20
  options = params.pop();
21
21
  }
22
22
  const toast = options ? showLoading(options) : null;
23
23
  try {
24
- return yield fn(params);
24
+ return yield fn(...params);
25
25
  // eslint-disable-next-line no-useless-catch
26
26
  }
27
27
  catch (error) {
@@ -7,4 +7,4 @@ import { Loose } from '@daysnap/types';
7
7
  */
8
8
  export declare function createWithLoading<O = any>(showLoading: (options: O) => Loose<{
9
9
  close: () => any;
10
- }>): <T extends (...args: any[]) => Promise<any>>(fn: T, options?: O) => (...params: [...Parameters<T>, (O | undefined)?]) => Promise<Awaited<ReturnType<T>>>;
10
+ }>, defaultOptions?: O): <T extends (...args: any[]) => Promise<any>>(fn: T, options?: O) => (...params: [...Parameters<T>, (O | undefined)?]) => Promise<Awaited<ReturnType<T>>>;
@@ -16,15 +16,15 @@ exports.createWithLoading = void 0;
16
16
  * const fn = withLoading(async () => { // ... })
17
17
  * fn() 执行的时候就会执行showLoading
18
18
  */
19
- function createWithLoading(showLoading) {
20
- return function withLoading(fn, options) {
19
+ function createWithLoading(showLoading, defaultOptions) {
20
+ return function withLoading(fn, options = defaultOptions) {
21
21
  return (...params) => __awaiter(this, void 0, void 0, function* () {
22
22
  if (params.length > fn.length) {
23
23
  options = params.pop();
24
24
  }
25
25
  const toast = options ? showLoading(options) : null;
26
26
  try {
27
- return yield fn(params);
27
+ return yield fn(...params);
28
28
  // eslint-disable-next-line no-useless-catch
29
29
  }
30
30
  catch (error) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@daysnap/utils",
3
- "version": "0.0.70",
3
+ "version": "0.0.72",
4
4
  "description": "通用的工具库",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",