@leafer/data 1.0.10 → 1.1.1

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leafer/data",
3
- "version": "1.0.10",
3
+ "version": "1.1.1",
4
4
  "description": "@leafer/data",
5
5
  "author": "Chao (Leafer) Wan",
6
6
  "license": "MIT",
@@ -22,6 +22,6 @@
22
22
  "leaferjs"
23
23
  ],
24
24
  "devDependencies": {
25
- "@leafer/interface": "1.0.10"
25
+ "@leafer/interface": "1.1.1"
26
26
  }
27
27
  }
package/src/DataHelper.ts CHANGED
@@ -9,15 +9,16 @@ export const DataHelper = {
9
9
  return t
10
10
  },
11
11
 
12
- assign(t: IObject, merge: IObject): void {
12
+ assign(t: IObject, merge: IObject, exclude?: IObject): void {
13
13
  let value: unknown
14
14
  Object.keys(merge).forEach(key => {
15
15
  value = merge[key]
16
- if (value?.constructor === Object) {
17
- (t[key]?.constructor === Object) ? assign(t[key], merge[key]) : t[key] = merge[key]
18
- } else {
19
- t[key] = merge[key]
16
+ if (value?.constructor === Object && t[key]?.constructor === Object) return assign(t[key], merge[key], exclude && exclude[key])
17
+ if (exclude && (key in exclude)) {
18
+ if (exclude[key]?.constructor === Object) assign(t[key] = {}, merge[key], exclude[key])
19
+ return
20
20
  }
21
+ t[key] = merge[key]
21
22
  })
22
23
  },
23
24
 
package/types/index.d.ts CHANGED
@@ -2,7 +2,7 @@ import { IObject, IBooleanMap, ILeafData, ILeaf, IPathCommandData, IJSONOptions
2
2
 
3
3
  declare const DataHelper: {
4
4
  default<T>(t: T, defaultData: IObject): T;
5
- assign(t: IObject, merge: IObject): void;
5
+ assign(t: IObject, merge: IObject, exclude?: IObject): void;
6
6
  copyAttrs(t: IObject, from: IObject, include: string[]): IObject;
7
7
  clone(data: unknown): IObject;
8
8
  toMap(list: string[]): IBooleanMap;