@pocket-architect/core 0.1.34 → 0.1.36

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 (11) hide show
  1. package/build/Entity.spec.js +4 -2
  2. package/build/Entity.spec.js.map +1 -1
  3. package/build/helpers/diff.d.ts +8 -2
  4. package/build/helpers/diff.js +41 -47
  5. package/build/helpers/diff.js.map +1 -1
  6. package/build/helpers/diff.spec.js +28 -0
  7. package/build/helpers/diff.spec.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/Entity.spec.ts +4 -2
  10. package/src/helpers/diff.spec.ts +28 -0
  11. package/src/helpers/diff.ts +57 -50
package/build/Entity.spec.js CHANGED
@@ -119,17 +119,18 @@ describe('Entity', function () {
119
119
  return String(value);
120
120
  };
121
121
  expect(entity.isDirty()).toEqual(false);
122
- expect((0, diff_1.getDiff)(beforeSnapshot, entity.snapshot(), formatter)).toEqual(null);
122
+ expect((0, diff_1.getDiff)(beforeSnapshot, entity.snapshot(), { formatter: formatter })).toEqual(null);
123
123
  entity.name = 'test changed';
124
124
  entity.setFirstAmount(200);
125
125
  expect(entity.isDirty()).toEqual(true);
126
- expect((0, diff_1.getDiff)(beforeSnapshot, entity.snapshot(), formatter)).toEqual([
126
+ expect((0, diff_1.getDiff)(beforeSnapshot, entity.snapshot(), { formatter: formatter })).toEqual([
127
127
  {
128
128
  "after": "test changed",
129
129
  "afterRaw": "test changed",
130
130
  "before": "test",
131
131
  "beforeRaw": "test",
132
132
  "index": null,
133
+ "field": "name",
133
134
  "kind": "changed",
134
135
  "path": "name"
135
136
  },
@@ -138,6 +139,7 @@ describe('Entity', function () {
138
139
  "afterRaw": 200,
139
140
  "before": "1000.00 грн",
140
141
  "beforeRaw": 1000,
142
+ "field": "amount",
141
143
  "index": 0,
142
144
  "kind": "changed",
143
145
  "path": "parts[0].amount"
package/build/Entity.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Entity.spec.js","sourceRoot":"","sources":["../src/Entity.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Entity.spec.js","sourceRoot":"","sources":["../src/Entity.spec.ts"],"names":[],"mappings":"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"}
package/build/helpers/diff.d.ts CHANGED
@@ -12,6 +12,7 @@ export interface DiffEntry {
12
12
  kind: DiffKind;
13
13
  before?: unknown;
14
14
  after?: unknown;
15
+ groupId?: string;
15
16
  }
16
17
  export interface LabelContext {
17
18
  key: string | null;
@@ -26,14 +27,19 @@ export interface DiffViewModel {
26
27
  field: string;
27
28
  path: string;
28
29
  index: number | null;
30
+ groupId?: string;
29
31
  beforeRaw?: unknown;
30
32
  afterRaw?: unknown;
31
33
  before?: string;
32
34
  after?: string;
33
35
  }
34
- export declare function diffObjects(before: unknown, after: unknown): DiffEntry[];
36
+ export interface DiffOptions {
37
+ formatter?: DiffFormatter;
38
+ groupRoots?: string[];
39
+ }
40
+ export declare function diffObjects(before: unknown, after: unknown, groupRoots?: string[]): DiffEntry[];
35
41
  export declare function buildDiffViewModel(diffs: DiffEntry[], formatValue?: DiffFormatter): DiffViewModel[];
36
42
  /**
37
43
  * Повертає diff у вигляді масиву обʼєктів (DiffViewModel),
38
44
  */
39
- export declare function getDiff(beforeObj: any, afterObj: any, formatter?: DiffFormatter): DiffViewModel[] | null;
45
+ export declare function getDiff(beforeObj: any, afterObj: any, options?: DiffOptions): DiffViewModel[] | null;
package/build/helpers/diff.js CHANGED
@@ -3,68 +3,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getDiff = exports.buildDiffViewModel = exports.diffObjects = void 0;
4
4
  var tslib_1 = require("tslib");
5
5
  var EntityId_1 = require("../EntityId");
6
- function diffObjects(before, after) {
6
+ function diffObjects(before, after, groupRoots) {
7
+ if (groupRoots === void 0) { groupRoots = []; }
7
8
  var diffs = [];
8
- walk(before, after, [], diffs);
9
+ walk(before, after, [], diffs, groupRoots);
9
10
  return diffs;
10
11
  }
11
12
  exports.diffObjects = diffObjects;
12
- function walk(before, after, segments, out) {
13
+ function walk(before, after, segments, out, groupRoots, forcedKind, currentGroupId) {
14
+ if (groupRoots === void 0) { groupRoots = []; }
13
15
  if (Object.is(before, after))
14
16
  return;
15
- var isPlainObject = function (v) {
16
- return typeof v === 'object' && v !== null && !Array.isArray(v);
17
- };
17
+ var isPlainObject = function (v) { return typeof v === 'object' && v !== null && !Array.isArray(v); };
18
+ // determine the kind of diff
19
+ var kind = forcedKind || 'changed';
20
+ if (!forcedKind) {
21
+ if (before === undefined && after !== undefined)
22
+ kind = 'added';
23
+ else if (before !== undefined && after === undefined)
24
+ kind = 'removed';
25
+ }
18
26
  // arrays
19
27
  if (Array.isArray(before) || Array.isArray(after)) {
20
28
  var bArr = Array.isArray(before) ? before : [];
21
29
  var aArr = Array.isArray(after) ? after : [];
22
30
  var max = Math.max(bArr.length, aArr.length);
31
+ var lastSegment = segments[segments.length - 1];
32
+ var isGroupRoot = (lastSegment === null || lastSegment === void 0 ? void 0 : lastSegment.type) === 'key' && groupRoots.includes(lastSegment.key);
23
33
  for (var i = 0; i < max; i++) {
24
- walk(bArr[i], aArr[i], tslib_1.__spreadArray(tslib_1.__spreadArray([], segments, true), [{ type: 'index', index: i }], false), out);
34
+ var nextSegments = tslib_1.__spreadArray(tslib_1.__spreadArray([], segments, true), [{ type: 'index', index: i }], false);
35
+ var nextGroupId = isGroupRoot ? segmentsToPath(nextSegments) : currentGroupId;
36
+ walk(bArr[i], aArr[i], nextSegments, out, groupRoots, kind, nextGroupId);
25
37
  }
26
38
  return;
27
39
  }
28
- // primitives or mismatched types
29
- if (!isPlainObject(before) || !isPlainObject(after)) {
30
- out.push({
31
- path: segmentsToPath(segments),
32
- segments: segments,
33
- kind: 'changed',
34
- before: before,
35
- after: after,
36
- });
37
- return;
38
- }
39
40
  // objects
40
- var bObj = before;
41
- var aObj = after;
42
- var keys = tslib_1.__spreadArray(tslib_1.__spreadArray([], Object.keys(bObj), true), Object.keys(aObj), true);
43
- for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
44
- var key = keys_1[_i];
45
- var b = bObj[key];
46
- var a = aObj[key];
47
- var nextSeg = tslib_1.__spreadArray(tslib_1.__spreadArray([], segments, true), [{ type: 'key', key: key }], false);
48
- if (b === undefined && a !== undefined) {
49
- out.push({
50
- path: segmentsToPath(nextSeg),
51
- segments: nextSeg,
52
- kind: 'added',
53
- after: a,
54
- });
55
- continue;
56
- }
57
- if (b !== undefined && a === undefined) {
58
- out.push({
59
- path: segmentsToPath(nextSeg),
60
- segments: nextSeg,
61
- kind: 'removed',
62
- before: b,
63
- });
64
- continue;
41
+ if (isPlainObject(before) || isPlainObject(after)) {
42
+ var bObj = (isPlainObject(before) ? before : {});
43
+ var aObj = (isPlainObject(after) ? after : {});
44
+ var keys = Array.from(new Set(tslib_1.__spreadArray(tslib_1.__spreadArray([], Object.keys(bObj), true), Object.keys(aObj), true)));
45
+ for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
46
+ var key = keys_1[_i];
47
+ walk(bObj[key], aObj[key], tslib_1.__spreadArray(tslib_1.__spreadArray([], segments, true), [{ type: 'key', key: key }], false), out, groupRoots, kind, currentGroupId);
65
48
  }
66
- walk(b, a, nextSeg, out);
49
+ return;
67
50
  }
51
+ // primitives or mismatched types
52
+ out.push({
53
+ path: segmentsToPath(segments),
54
+ segments: segments,
55
+ kind: kind,
56
+ before: before,
57
+ after: after,
58
+ groupId: currentGroupId,
59
+ });
68
60
  }
69
61
  function segmentsToPath(segments) {
70
62
  var path = '';
@@ -134,6 +126,7 @@ function buildDiffViewModel(diffs, formatValue) {
134
126
  kind: entry.kind,
135
127
  path: entry.path,
136
128
  index: ctx.index,
129
+ groupId: entry.groupId,
137
130
  beforeRaw: entry.before,
138
131
  afterRaw: entry.after,
139
132
  before: beforeFormatted,
@@ -147,11 +140,12 @@ exports.buildDiffViewModel = buildDiffViewModel;
147
140
  * Повертає diff у вигляді масиву обʼєктів (DiffViewModel),
148
141
  */
149
142
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
150
- function getDiff(beforeObj, afterObj, formatter) {
151
- var diffs = diffObjects(beforeObj, afterObj);
143
+ function getDiff(beforeObj, afterObj, options) {
144
+ if (options === void 0) { options = {}; }
145
+ var diffs = diffObjects(beforeObj, afterObj, options.groupRoots);
152
146
  if (diffs.length === 0)
153
147
  return null;
154
- return buildDiffViewModel(diffs, formatter);
148
+ return buildDiffViewModel(diffs, options.formatter);
155
149
  }
156
150
  exports.getDiff = getDiff;
157
151
  //# sourceMappingURL=diff.js.map
package/build/helpers/diff.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/helpers/diff.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/helpers/diff.ts"],"names":[],"mappings":"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"}
package/build/helpers/diff.spec.js CHANGED
@@ -4,6 +4,8 @@ var diff_1 = require("./diff");
4
4
  test('getDiff', function () {
5
5
  expect((0, diff_1.getDiff)({ test: '1' }, { test: '2' })).toEqual([
6
6
  {
7
+ "field": "test",
8
+ "groupId": undefined,
7
9
  "after": "2",
8
10
  "afterRaw": "2",
9
11
  "before": "1",
@@ -15,6 +17,8 @@ test('getDiff', function () {
15
17
  ]);
16
18
  expect((0, diff_1.getDiff)({ test: [1] }, { test: [2] })).toEqual([
17
19
  {
20
+ "field": "test",
21
+ "groupId": undefined,
18
22
  "after": 2,
19
23
  "afterRaw": 2,
20
24
  "before": 1,
@@ -26,6 +30,8 @@ test('getDiff', function () {
26
30
  ]);
27
31
  expect((0, diff_1.getDiff)({ test: [] }, { test: [2] })).toEqual([
28
32
  {
33
+ "field": "test",
34
+ "groupId": undefined,
29
35
  "after": 2,
30
36
  "afterRaw": 2,
31
37
  "index": 0,
@@ -35,6 +41,8 @@ test('getDiff', function () {
35
41
  ]);
36
42
  expect((0, diff_1.getDiff)({ test: [1] }, { test: [] })).toEqual([
37
43
  {
44
+ "field": "test",
45
+ "groupId": undefined,
38
46
  "before": 1,
39
47
  "beforeRaw": 1,
40
48
  "index": 0,
@@ -42,5 +50,25 @@ test('getDiff', function () {
42
50
  "path": "test[0]"
43
51
  }
44
52
  ]);
53
+ expect((0, diff_1.getDiff)({ parts: [{ test: 1 }] }, { parts: [{ test: 1 }, { test: 2 }] })).toEqual([
54
+ {
55
+ "after": 2,
56
+ "afterRaw": 2,
57
+ "field": "test",
58
+ "index": 1,
59
+ "kind": "changed",
60
+ "path": "parts[1].test"
61
+ }
62
+ ]);
63
+ expect((0, diff_1.getDiff)({ parts: [{ test: 1 }, { test: 2 }] }, { parts: [{ test: 1 }] })).toEqual([
64
+ {
65
+ "before": 2,
66
+ "beforeRaw": 2,
67
+ "field": "test",
68
+ "index": 1,
69
+ "kind": "changed",
70
+ "path": "parts[1].test"
71
+ }
72
+ ]);
45
73
  });
46
74
  //# sourceMappingURL=diff.spec.js.map
package/build/helpers/diff.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"diff.spec.js","sourceRoot":"","sources":["../../src/helpers/diff.spec.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAE/B,IAAI,CAAC,SAAS,EAAE;IACd,MAAM,CAAC,IAAA,cAAO,EAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACpD;YACE,OAAO,EAAE,GAAG;YACZ,UAAU,EAAE,GAAG;YACf,QAAQ,EAAE,GAAG;YACb,WAAW,EAAE,GAAG;YAChB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,MAAM;SACf;KACF,CAAC,CAAC;IACH,MAAM,CAAC,IAAA,cAAO,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACpD;YACE,OAAO,EAAE,CAAC;YACV,UAAU,EAAE,CAAC;YACb,QAAQ,EAAE,CAAC;YACX,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;SAClB;KACF,CAAC,CAAC;IACH,MAAM,CAAC,IAAA,cAAO,EAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACnD;YACE,OAAO,EAAE,CAAC;YACV,UAAU,EAAE,CAAC;YACb,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;SAClB;KACF,CAAC,CAAC;IACH,MAAM,CAAC,IAAA,cAAO,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACnD;YACE,QAAQ,EAAE,CAAC;YACX,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;SAClB;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"diff.spec.js","sourceRoot":"","sources":["../../src/helpers/diff.spec.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAE/B,IAAI,CAAC,SAAS,EAAE;IACd,MAAM,CAAC,IAAA,cAAO,EAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACpD;YACE,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,GAAG;YACZ,UAAU,EAAE,GAAG;YACf,QAAQ,EAAE,GAAG;YACb,WAAW,EAAE,GAAG;YAChB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,MAAM;SACf;KACF,CAAC,CAAC;IACH,MAAM,CAAC,IAAA,cAAO,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACpD;YACE,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,CAAC;YACV,UAAU,EAAE,CAAC;YACb,QAAQ,EAAE,CAAC;YACX,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;SAClB;KACF,CAAC,CAAC;IACH,MAAM,CAAC,IAAA,cAAO,EAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACnD;YACE,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,CAAC;YACV,UAAU,EAAE,CAAC;YACb,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;SAClB;KACF,CAAC,CAAC;IACH,MAAM,CAAC,IAAA,cAAO,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACnD;YACE,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,SAAS;YACpB,QAAQ,EAAE,CAAC;YACX,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;SAClB;KACF,CAAC,CAAC;IACH,MAAM,CAAC,IAAA,cAAO,EAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACvF;YACE,OAAO,EAAE,CAAC;YACV,UAAU,EAAE,CAAC;YACb,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,eAAe;SACxB;KACF,CAAC,CAAC;IACH,MAAM,CAAC,IAAA,cAAO,EAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACvF;YACE,QAAQ,EAAE,CAAC;YACX,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,eAAe;SACxB;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pocket-architect/core",
3
- "version": "0.1.34",
3
+ "version": "0.1.36",
4
4
  "description": "",
5
5
  "main": "build/index.js",
6
6
  "scripts": {
package/src/Entity.spec.ts CHANGED
@@ -115,17 +115,18 @@ describe('Entity', () => {
115
115
  };
116
116
 
117
117
  expect(entity.isDirty()).toEqual(false);
118
- expect(getDiff(beforeSnapshot, entity.snapshot(), formatter)).toEqual(null);
118
+ expect(getDiff(beforeSnapshot, entity.snapshot(), {formatter})).toEqual(null);
119
119
  entity.name = 'test changed';
120
120
  entity.setFirstAmount(200);
121
121
  expect(entity.isDirty()).toEqual(true);
122
- expect(getDiff(beforeSnapshot, entity.snapshot(), formatter)).toEqual([
122
+ expect(getDiff(beforeSnapshot, entity.snapshot(), {formatter})).toEqual([
123
123
  {
124
124
  "after": "test changed",
125
125
  "afterRaw": "test changed",
126
126
  "before": "test",
127
127
  "beforeRaw": "test",
128
128
  "index": null,
129
+ "field": "name",
129
130
  "kind": "changed",
130
131
  "path": "name"
131
132
  },
@@ -134,6 +135,7 @@ describe('Entity', () => {
134
135
  "afterRaw": 200,
135
136
  "before": "1000.00 грн",
136
137
  "beforeRaw": 1000,
138
+ "field": "amount",
137
139
  "index": 0,
138
140
  "kind": "changed",
139
141
  "path": "parts[0].amount"
package/src/helpers/diff.spec.ts CHANGED
@@ -3,6 +3,8 @@ import {getDiff} from "./diff";
3
3
  test('getDiff', () => {
4
4
  expect(getDiff({ test: '1' }, { test: '2' })).toEqual([
5
5
  {
6
+ "field": "test",
7
+ "groupId": undefined,
6
8
  "after": "2",
7
9
  "afterRaw": "2",
8
10
  "before": "1",
@@ -14,6 +16,8 @@ test('getDiff', () => {
14
16
  ]);
15
17
  expect(getDiff({ test: [1] }, { test: [2] })).toEqual([
16
18
  {
19
+ "field": "test",
20
+ "groupId": undefined,
17
21
  "after": 2,
18
22
  "afterRaw": 2,
19
23
  "before": 1,
@@ -25,6 +29,8 @@ test('getDiff', () => {
25
29
  ]);
26
30
  expect(getDiff({ test: [] }, { test: [2] })).toEqual([
27
31
  {
32
+ "field": "test",
33
+ "groupId": undefined,
28
34
  "after": 2,
29
35
  "afterRaw": 2,
30
36
  "index": 0,
@@ -34,6 +40,8 @@ test('getDiff', () => {
34
40
  ]);
35
41
  expect(getDiff({ test: [1] }, { test: [] })).toEqual([
36
42
  {
43
+ "field": "test",
44
+ "groupId": undefined,
37
45
  "before": 1,
38
46
  "beforeRaw": 1,
39
47
  "index": 0,
@@ -41,4 +49,24 @@ test('getDiff', () => {
41
49
  "path": "test[0]"
42
50
  }
43
51
  ]);
52
+ expect(getDiff({ parts: [{ test: 1 }] }, { parts: [{ test: 1 }, { test: 2 }] })).toEqual([
53
+ {
54
+ "after": 2,
55
+ "afterRaw": 2,
56
+ "field": "test",
57
+ "index": 1,
58
+ "kind": "changed",
59
+ "path": "parts[1].test"
60
+ }
61
+ ]);
62
+ expect(getDiff({ parts: [{ test: 1 }, { test: 2 }] }, { parts: [{ test: 1 }] })).toEqual([
63
+ {
64
+ "before": 2,
65
+ "beforeRaw": 2,
66
+ "field": "test",
67
+ "index": 1,
68
+ "kind": "changed",
69
+ "path": "parts[1].test"
70
+ }
71
+ ]);
44
72
  });
package/src/helpers/diff.ts CHANGED
@@ -12,6 +12,7 @@ export interface DiffEntry {
12
12
  kind: DiffKind;
13
13
  before?: unknown;
14
14
  after?: unknown;
15
+ groupId?: string;
15
16
  }
16
17
 
17
18
  export interface LabelContext {
@@ -29,6 +30,7 @@ export interface DiffViewModel {
29
30
  field: string;
30
31
  path: string;
31
32
  index: number | null;
33
+ groupId?: string;
32
34
 
33
35
  beforeRaw?: unknown;
34
36
  afterRaw?: unknown;
@@ -37,9 +39,14 @@ export interface DiffViewModel {
37
39
  after?: string;
38
40
  }
39
41
 
40
- export function diffObjects(before: unknown, after: unknown): DiffEntry[] {
42
+ export interface DiffOptions {
43
+ formatter?: DiffFormatter;
44
+ groupRoots?: string[];
45
+ }
46
+
47
+ export function diffObjects(before: unknown, after: unknown, groupRoots: string[] = []): DiffEntry[] {
41
48
  const diffs: DiffEntry[] = [];
42
- walk(before, after, [], diffs);
49
+ walk(before, after, [], diffs, groupRoots);
43
50
  return diffs;
44
51
  }
45
52
 
@@ -47,12 +54,21 @@ function walk(
47
54
  before: unknown,
48
55
  after: unknown,
49
56
  segments: PathSegment[],
50
- out: DiffEntry[]
57
+ out: DiffEntry[],
58
+ groupRoots: string[] = [],
59
+ forcedKind?: DiffKind,
60
+ currentGroupId?: string,
51
61
  ): void {
52
62
  if (Object.is(before, after)) return;
53
63
 
54
- const isPlainObject = (v: unknown) =>
55
- typeof v === 'object' && v !== null && !Array.isArray(v);
64
+ const isPlainObject = (v: unknown) => typeof v === 'object' && v !== null && !Array.isArray(v);
65
+
66
+ // determine the kind of diff
67
+ let kind: DiffKind = forcedKind || 'changed';
68
+ if (!forcedKind) {
69
+ if (before === undefined && after !== undefined) kind = 'added';
70
+ else if (before !== undefined && after === undefined) kind = 'removed';
71
+ }
56
72
 
57
73
  // arrays
58
74
  if (Array.isArray(before) || Array.isArray(after)) {
@@ -60,56 +76,46 @@ function walk(
60
76
  const aArr = Array.isArray(after) ? after : [];
61
77
  const max = Math.max(bArr.length, aArr.length);
62
78
 
79
+ const lastSegment = segments[segments.length - 1];
80
+ const isGroupRoot = lastSegment?.type === 'key' && groupRoots.includes(lastSegment.key);
81
+
63
82
  for (let i = 0; i < max; i++) {
64
- walk(bArr[i], aArr[i], [...segments, { type: 'index', index: i }], out);
83
+ const nextSegments = [...segments, { type: 'index', index: i } as const];
84
+ const nextGroupId = isGroupRoot ? segmentsToPath(nextSegments) : currentGroupId;
85
+ walk(bArr[i], aArr[i], nextSegments, out, groupRoots, kind, nextGroupId);
65
86
  }
66
87
  return;
67
88
  }
68
89
 
69
- // primitives or mismatched types
70
- if (!isPlainObject(before) || !isPlainObject(after)) {
71
- out.push({
72
- path: segmentsToPath(segments),
73
- segments,
74
- kind: 'changed',
75
- before,
76
- after,
77
- });
78
- return;
79
- }
80
-
81
90
  // objects
82
- const bObj = before as Record<string, unknown>;
83
- const aObj = after as Record<string, unknown>;
84
- const keys = [...Object.keys(bObj), ...Object.keys(aObj)];
85
-
86
- for (const key of keys) {
87
- const b = bObj[key];
88
- const a = aObj[key];
89
- const nextSeg = [...segments, { type: 'key', key } as const];
90
-
91
- if (b === undefined && a !== undefined) {
92
- out.push({
93
- path: segmentsToPath(nextSeg),
94
- segments: nextSeg,
95
- kind: 'added',
96
- after: a,
97
- });
98
- continue;
99
- }
100
-
101
- if (b !== undefined && a === undefined) {
102
- out.push({
103
- path: segmentsToPath(nextSeg),
104
- segments: nextSeg,
105
- kind: 'removed',
106
- before: b,
107
- });
108
- continue;
91
+ if (isPlainObject(before) || isPlainObject(after)) {
92
+ const bObj = (isPlainObject(before) ? before : {}) as Record<string, unknown>;
93
+ const aObj = (isPlainObject(after) ? after : {}) as Record<string, unknown>;
94
+ const keys = Array.from(new Set([...Object.keys(bObj), ...Object.keys(aObj)]));
95
+
96
+ for (const key of keys) {
97
+ walk(
98
+ bObj[key],
99
+ aObj[key],
100
+ [...segments, { type: 'key', key } as const],
101
+ out,
102
+ groupRoots,
103
+ kind,
104
+ currentGroupId,
105
+ );
109
106
  }
110
-
111
- walk(b, a, nextSeg, out);
107
+ return;
112
108
  }
109
+
110
+ // primitives or mismatched types
111
+ out.push({
112
+ path: segmentsToPath(segments),
113
+ segments,
114
+ kind,
115
+ before,
116
+ after,
117
+ groupId: currentGroupId,
118
+ });
113
119
  }
114
120
 
115
121
  function segmentsToPath(segments: PathSegment[]): string {
@@ -189,6 +195,7 @@ export function buildDiffViewModel(diffs: DiffEntry[], formatValue?: DiffFormatt
189
195
  kind: entry.kind,
190
196
  path: entry.path,
191
197
  index: ctx.index,
198
+ groupId: entry.groupId,
192
199
  beforeRaw: entry.before,
193
200
  afterRaw: entry.after,
194
201
  before: beforeFormatted,
@@ -203,9 +210,9 @@ export function buildDiffViewModel(diffs: DiffEntry[], formatValue?: DiffFormatt
203
210
  * Повертає diff у вигляді масиву обʼєктів (DiffViewModel),
204
211
  */
205
212
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
206
- export function getDiff(beforeObj: any, afterObj: any, formatter?: DiffFormatter): DiffViewModel[] | null {
207
- const diffs = diffObjects(beforeObj, afterObj);
213
+ export function getDiff(beforeObj: any, afterObj: any, options: DiffOptions = {}): DiffViewModel[] | null {
214
+ const diffs = diffObjects(beforeObj, afterObj, options.groupRoots);
208
215
  if (diffs.length === 0) return null;
209
216
 
210
- return buildDiffViewModel(diffs, formatter);
217
+ return buildDiffViewModel(diffs, options.formatter);
211
218
  }