xjs-common 13.0.0 → 13.0.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.
@@ -64,7 +64,7 @@ var UObj;
64
64
  if (u_type_1.UType.isObject(prop) && _recursive)
65
65
  rec(prop);
66
66
  else if (!u_type_1.UType.isFunction(prop) && (!target || target.some(t => typeof prop === t)))
67
- _o[k] = process(prop);
67
+ _o[k] = process(prop, k);
68
68
  }
69
69
  };
70
70
  rec(o);
@@ -61,10 +61,17 @@ function retry(cb, op) {
61
61
  throw e;
62
62
  }
63
63
  if (ret instanceof Promise) {
64
- return new Promise((resolve, reject) => ret.then(resolve).catch((e) => { if (handleError(e))
65
- resolve(prcs(c - 1));
66
- else
67
- reject(e); }));
64
+ return new Promise((resolve, reject) => ret.then(resolve).catch((e) => {
65
+ if (handleError(e))
66
+ try {
67
+ ret = resolve(prcs(c - 1));
68
+ }
69
+ catch (e2) {
70
+ reject(e2);
71
+ }
72
+ else
73
+ reject(e);
74
+ }));
68
75
  }
69
76
  else
70
77
  return ret;
@@ -31,7 +31,7 @@ export declare namespace UObj {
31
31
  * @param op.recursive whether it manipulate properties of an object recursively. default is true.
32
32
  * @param op.targetType primitive types which filter the properties to be processed.
33
33
  */
34
- function manipulateProperties<T extends NormalRecord>(o: T, process: (v: NonObject) => NonObject, op?: {
34
+ function manipulateProperties<T extends NormalRecord>(o: T, process: (p: NonObject, k: string) => NonObject, op?: {
35
35
  ignoreEmpty?: boolean;
36
36
  recursive?: boolean;
37
37
  targetType?: MaybeArray<Exclude<Type, "object" | "null" | "undefined">>;
@@ -61,7 +61,7 @@ export var UObj;
61
61
  if (UType.isObject(prop) && _recursive)
62
62
  rec(prop);
63
63
  else if (!UType.isFunction(prop) && (!target || target.some(t => typeof prop === t)))
64
- _o[k] = process(prop);
64
+ _o[k] = process(prop, k);
65
65
  }
66
66
  };
67
67
  rec(o);
@@ -53,10 +53,17 @@ export function retry(cb, op) {
53
53
  throw e;
54
54
  }
55
55
  if (ret instanceof Promise) {
56
- return new Promise((resolve, reject) => ret.then(resolve).catch((e) => { if (handleError(e))
57
- resolve(prcs(c - 1));
58
- else
59
- reject(e); }));
56
+ return new Promise((resolve, reject) => ret.then(resolve).catch((e) => {
57
+ if (handleError(e))
58
+ try {
59
+ ret = resolve(prcs(c - 1));
60
+ }
61
+ catch (e2) {
62
+ reject(e2);
63
+ }
64
+ else
65
+ reject(e);
66
+ }));
60
67
  }
61
68
  else
62
69
  return ret;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xjs-common",
3
- "version": "13.0.0",
3
+ "version": "13.0.2",
4
4
  "description": "library modules for typescript that bundled general-purpose implementations.",
5
5
  "repository": {
6
6
  "type": "git",