@pocket-architect/core 0.1.27 → 0.1.30
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/build/Entity.spec.js +8 -22
- package/build/Entity.spec.js.map +1 -1
- package/build/EventBus.spec.js +0 -11
- package/build/EventBus.spec.js.map +1 -1
- package/build/helpers/diff.d.ts +4 -12
- package/build/helpers/diff.js +12 -20
- package/build/helpers/diff.js.map +1 -1
- package/build/helpers/diff.spec.d.ts +1 -0
- package/build/helpers/diff.spec.js +46 -0
- package/build/helpers/diff.spec.js.map +1 -0
- package/build/index.d.ts +2 -2
- package/build/index.js.map +1 -1
- package/package.json +1 -1
- package/src/Entity.spec.ts +6 -18
- package/src/EventBus.spec.ts +0 -12
- package/src/helpers/diff.spec.ts +44 -0
- package/src/helpers/diff.ts +15 -35
- package/src/index.ts +2 -2
package/build/Entity.spec.js
CHANGED
|
@@ -109,26 +109,14 @@ describe('Entity', function () {
|
|
|
109
109
|
snapshot.name = 'changed';
|
|
110
110
|
}).toThrow();
|
|
111
111
|
beforeSnapshot = entity.snapshot();
|
|
112
|
-
formatter = {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
return 'Імʼя';
|
|
121
|
-
return undefined;
|
|
122
|
-
},
|
|
123
|
-
formatValue: function (value, _a) {
|
|
124
|
-
var key = _a.key;
|
|
125
|
-
if (value instanceof EntityId_1.EntityId) {
|
|
126
|
-
return value.toHash();
|
|
127
|
-
}
|
|
128
|
-
if (key === 'amount' && typeof value === 'number')
|
|
129
|
-
return "".concat(value.toFixed(2), " \u0433\u0440\u043D");
|
|
130
|
-
return String(value);
|
|
131
|
-
},
|
|
112
|
+
formatter = function (value, _a) {
|
|
113
|
+
var key = _a.key;
|
|
114
|
+
if (value instanceof EntityId_1.EntityId) {
|
|
115
|
+
return value.toHash();
|
|
116
|
+
}
|
|
117
|
+
if (key === 'amount' && typeof value === 'number')
|
|
118
|
+
return "".concat(value.toFixed(2), " \u0433\u0440\u043D");
|
|
119
|
+
return String(value);
|
|
132
120
|
};
|
|
133
121
|
expect(entity.isDirty()).toEqual(false);
|
|
134
122
|
expect((0, diff_1.getDiff)(beforeSnapshot, entity.snapshot(), formatter)).toEqual(null);
|
|
@@ -143,7 +131,6 @@ describe('Entity', function () {
|
|
|
143
131
|
"beforeRaw": "test",
|
|
144
132
|
"index": null,
|
|
145
133
|
"kind": "changed",
|
|
146
|
-
"label": "Імʼя",
|
|
147
134
|
"path": "name"
|
|
148
135
|
},
|
|
149
136
|
{
|
|
@@ -153,7 +140,6 @@ describe('Entity', function () {
|
|
|
153
140
|
"beforeRaw": 1000,
|
|
154
141
|
"index": 0,
|
|
155
142
|
"kind": "changed",
|
|
156
|
-
"label": "Ціна (позиція 1)",
|
|
157
143
|
"path": "parts[0].amount"
|
|
158
144
|
}
|
|
159
145
|
]);
|
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":";;;AAAA,mCAAkC;AAClC,uCAAsC;AACtC,uCAAuC;AAevC;IAAyB,sCAA2C;IAApE;;IAgBA,CAAC;IAfQ,iBAAM,GAAb,UAAc,KAAgB,EAAE,EAA2B;QACzD,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,sBAAI,4BAAI;aAAR,UAAS,IAAY;YACnB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QACzB,CAAC;;;OAAA;IAED,sBAAI,8BAAM;aAAV,UAAW,GAAqB;YAC9B,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC;QAC1B,CAAC;;;OAAA;IAED,mCAAc,GAAd,UAAe,MAAa;QAC1B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC;IACtC,CAAC;IACH,iBAAC;AAAD,CAAC,AAhBD,CAAyB,eAAM,GAgB9B;AACD;IAA0B,uCAA4C;IAAtE;;IAIA,CAAC;IAHQ,kBAAM,GAAb,UAAc,KAAiB,EAAE,EAA2B;QAC1D,OAAO,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACpC,CAAC;IACH,kBAAC;AAAD,CAAC,AAJD,CAA0B,eAAM,GAI/B;AAED,QAAQ,CAAC,QAAQ,EAAE;IACjB,IAAI,MAAkB,CAAC;IAEvB,SAAS,CAAC;QACR,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YACzB,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,mBAAQ,CAAC,GAAG,CAAC;YACvC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,mBAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACtE,KAAK,EAAE,CAAC;oBACN,MAAM,EAAE,IAAI;oBACZ,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,mBAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;iBAC/E,CAAC;SACH,EAAE,GAAG,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE;;;YACL,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC;gBAClC,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,mBAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtE,KAAK,EAAE,EAAE;aACV,CAAC,CAAC;YACH,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY;YAE1D,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC;gBAChC,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,mBAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtE,KAAK,EAAE,EAAE;aACV,EAAE,GAAG,CAAC,CAAC;YACR,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU;YACvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,gBAAgB;YAC5D,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO;YAChD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAa,EAAE,EAAE,EAAE,IAAI,mBAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,aAAa;YACvF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;YAEvE,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC;gBAChC,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,mBAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtE,KAAK,EAAE,EAAE;aACV,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YACd,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU;YACvD,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9C,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;;;SAC/E,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,EAAE;;;YACT,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;gBACvB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP;wBACE,QAAQ,EAAE,IAAI;wBACd,QAAQ,EAAE;4BACR,MAAM,EAAE,aAAa;4BACrB,QAAQ,EAAE,OAAO;yBAClB;qBACF;iBACF;gBACD,OAAO,EAAE;oBACP,MAAM,EAAE,MAAM;oBACd,QAAQ,EAAE,OAAO;iBAClB;gBACD,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAC;YAEH,MAAM,CAAC;gBACL,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC;YAC5B,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YACP,cAAc,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YACnC,SAAS,GAAG,UAAC,KAAK,EAAE,EAAO;oBAAL,GAAG,SAAA;gBAC7B,IAAI,KAAK,YAAY,mBAAQ,EAAE,CAAC;oBAC9B,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;gBACxB,CAAC;gBACD,IAAI,GAAG,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ;oBAAE,OAAO,UAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAM,CAAC;gBACpF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACxC,MAAM,CAAC,IAAA,cAAO,EAAC,cAAc,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC5E,MAAM,CAAC,IAAI,GAAG,cAAc,CAAC;YAC7B,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YAC3B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,CAAC,IAAA,cAAO,EAAC,cAAc,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;gBACpE;oBACE,OAAO,EAAE,cAAc;oBACvB,UAAU,EAAE,cAAc;oBAC1B,QAAQ,EAAE,MAAM;oBAChB,WAAW,EAAE,MAAM;oBACnB,OAAO,EAAE,IAAI;oBACb,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,MAAM;iBACf;gBACD;oBACE,OAAO,EAAE,YAAY;oBACrB,UAAU,EAAE,GAAG;oBACf,QAAQ,EAAE,aAAa;oBACvB,WAAW,EAAE,IAAI;oBACjB,OAAO,EAAE,CAAC;oBACV,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,iBAAiB;iBAC1B;aACF,CAAC,CAAC;;;SACJ,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/build/EventBus.spec.js
CHANGED
|
@@ -88,17 +88,6 @@ describe('EventBus', function () {
|
|
|
88
88
|
enumerable: false,
|
|
89
89
|
configurable: true
|
|
90
90
|
});
|
|
91
|
-
User.prototype.toDiff = function () {
|
|
92
|
-
return {
|
|
93
|
-
resolveLabel: function (_a) {
|
|
94
|
-
var key = _a.key;
|
|
95
|
-
return key;
|
|
96
|
-
},
|
|
97
|
-
formatValue: function (value) {
|
|
98
|
-
return value === null || value === void 0 ? void 0 : value.toString();
|
|
99
|
-
},
|
|
100
|
-
};
|
|
101
|
-
};
|
|
102
91
|
return User;
|
|
103
92
|
}(Entity_1.Entity));
|
|
104
93
|
UserCreatedEvent = /** @class */ (function (_super) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventBus.spec.js","sourceRoot":"","sources":["../src/EventBus.spec.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAE7D,6CAA4D;AAC5D,uCAAoC;AACpC,mCAAgC;
|
|
1
|
+
{"version":3,"file":"EventBus.spec.js","sourceRoot":"","sources":["../src/EventBus.spec.ts"],"names":[],"mappings":"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"}
|
package/build/helpers/diff.d.ts
CHANGED
|
@@ -20,18 +20,10 @@ export interface LabelContext {
|
|
|
20
20
|
segments: PathSegment[];
|
|
21
21
|
entry: DiffEntry;
|
|
22
22
|
}
|
|
23
|
-
export
|
|
24
|
-
/**
|
|
25
|
-
* - string → label (людська назва поля)
|
|
26
|
-
* - null → ignore
|
|
27
|
-
* - undefined → fallback на path
|
|
28
|
-
*/
|
|
29
|
-
resolveLabel?: (ctx: LabelContext) => string | null | undefined;
|
|
30
|
-
formatValue?: (value: unknown, ctx: LabelContext) => string;
|
|
31
|
-
}
|
|
23
|
+
export type DiffFormatter = (value: unknown, ctx: LabelContext) => string;
|
|
32
24
|
export interface DiffViewModel {
|
|
33
25
|
kind: DiffKind;
|
|
34
|
-
|
|
26
|
+
field: string;
|
|
35
27
|
path: string;
|
|
36
28
|
index: number | null;
|
|
37
29
|
beforeRaw?: unknown;
|
|
@@ -40,8 +32,8 @@ export interface DiffViewModel {
|
|
|
40
32
|
after?: string;
|
|
41
33
|
}
|
|
42
34
|
export declare function diffObjects(before: unknown, after: unknown): DiffEntry[];
|
|
43
|
-
export declare function buildDiffViewModel(diffs: DiffEntry[],
|
|
35
|
+
export declare function buildDiffViewModel(diffs: DiffEntry[], formatValue?: DiffFormatter): DiffViewModel[];
|
|
44
36
|
/**
|
|
45
37
|
* Повертає diff у вигляді масиву обʼєктів (DiffViewModel),
|
|
46
38
|
*/
|
|
47
|
-
export declare function getDiff(beforeObj: any, afterObj: any,
|
|
39
|
+
export declare function getDiff(beforeObj: any, afterObj: any, formatter?: DiffFormatter): DiffViewModel[] | null;
|
package/build/helpers/diff.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getDiff = exports.buildDiffViewModel = exports.diffObjects = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
+
var EntityId_1 = require("../EntityId");
|
|
5
6
|
function diffObjects(before, after) {
|
|
6
7
|
var diffs = [];
|
|
7
8
|
walk(before, after, [], diffs);
|
|
@@ -103,30 +104,21 @@ function buildLabelContext(entry) {
|
|
|
103
104
|
entry: entry,
|
|
104
105
|
};
|
|
105
106
|
}
|
|
107
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
106
108
|
function defaultStringify(value) {
|
|
107
|
-
if (
|
|
108
|
-
return
|
|
109
|
-
|
|
110
|
-
return value ? 'true' : 'false';
|
|
111
|
-
if (value === null)
|
|
112
|
-
return 'null';
|
|
113
|
-
if (typeof value === 'object')
|
|
114
|
-
return JSON.stringify(value);
|
|
115
|
-
return String(value);
|
|
109
|
+
if (value instanceof EntityId_1.EntityId)
|
|
110
|
+
return value.toJSON();
|
|
111
|
+
return value;
|
|
116
112
|
}
|
|
117
|
-
function buildDiffViewModel(diffs,
|
|
118
|
-
var
|
|
113
|
+
function buildDiffViewModel(diffs, formatValue) {
|
|
114
|
+
var formatter = formatValue || defaultStringify;
|
|
119
115
|
var seen = new Set();
|
|
120
116
|
var result = [];
|
|
121
117
|
for (var _i = 0, diffs_1 = diffs; _i < diffs_1.length; _i++) {
|
|
122
118
|
var entry = diffs_1[_i];
|
|
123
119
|
var ctx = buildLabelContext(entry);
|
|
124
|
-
var
|
|
125
|
-
|
|
126
|
-
continue;
|
|
127
|
-
var label = resolvedLabel !== null && resolvedLabel !== void 0 ? resolvedLabel : entry.path;
|
|
128
|
-
var beforeFormatted = entry.before !== undefined ? formatValue(entry.before, ctx) : undefined;
|
|
129
|
-
var afterFormatted = entry.after !== undefined ? formatValue(entry.after, ctx) : undefined;
|
|
120
|
+
var beforeFormatted = entry.before !== undefined ? formatter(entry.before, ctx) : undefined;
|
|
121
|
+
var afterFormatted = entry.after !== undefined ? formatter(entry.after, ctx) : undefined;
|
|
130
122
|
// якщо форматовано однаково — не зміна
|
|
131
123
|
if (entry.kind === 'changed' && beforeFormatted === afterFormatted) {
|
|
132
124
|
continue;
|
|
@@ -138,8 +130,8 @@ function buildDiffViewModel(diffs, options) {
|
|
|
138
130
|
}
|
|
139
131
|
seen.add(dedupeKey);
|
|
140
132
|
result.push({
|
|
133
|
+
field: ctx.key || ctx.path,
|
|
141
134
|
kind: entry.kind,
|
|
142
|
-
label: label,
|
|
143
135
|
path: entry.path,
|
|
144
136
|
index: ctx.index,
|
|
145
137
|
beforeRaw: entry.before,
|
|
@@ -155,11 +147,11 @@ exports.buildDiffViewModel = buildDiffViewModel;
|
|
|
155
147
|
* Повертає diff у вигляді масиву обʼєктів (DiffViewModel),
|
|
156
148
|
*/
|
|
157
149
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
158
|
-
function getDiff(beforeObj, afterObj,
|
|
150
|
+
function getDiff(beforeObj, afterObj, formatter) {
|
|
159
151
|
var diffs = diffObjects(beforeObj, afterObj);
|
|
160
152
|
if (diffs.length === 0)
|
|
161
153
|
return null;
|
|
162
|
-
return buildDiffViewModel(diffs,
|
|
154
|
+
return buildDiffViewModel(diffs, formatter);
|
|
163
155
|
}
|
|
164
156
|
exports.getDiff = getDiff;
|
|
165
157
|
//# sourceMappingURL=diff.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/helpers/diff.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/helpers/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
var diff_1 = require("./diff");
|
|
4
|
+
test('getDiff', function () {
|
|
5
|
+
expect((0, diff_1.getDiff)({ test: '1' }, { test: '2' })).toEqual([
|
|
6
|
+
{
|
|
7
|
+
"after": "2",
|
|
8
|
+
"afterRaw": "2",
|
|
9
|
+
"before": "1",
|
|
10
|
+
"beforeRaw": "1",
|
|
11
|
+
"index": null,
|
|
12
|
+
"kind": "changed",
|
|
13
|
+
"path": "test"
|
|
14
|
+
}
|
|
15
|
+
]);
|
|
16
|
+
expect((0, diff_1.getDiff)({ test: [1] }, { test: [2] })).toEqual([
|
|
17
|
+
{
|
|
18
|
+
"after": 2,
|
|
19
|
+
"afterRaw": 2,
|
|
20
|
+
"before": 1,
|
|
21
|
+
"beforeRaw": 1,
|
|
22
|
+
"index": 0,
|
|
23
|
+
"kind": "changed",
|
|
24
|
+
"path": "test[0]"
|
|
25
|
+
}
|
|
26
|
+
]);
|
|
27
|
+
expect((0, diff_1.getDiff)({ test: [] }, { test: [2] })).toEqual([
|
|
28
|
+
{
|
|
29
|
+
"after": 2,
|
|
30
|
+
"afterRaw": 2,
|
|
31
|
+
"index": 0,
|
|
32
|
+
"kind": "changed",
|
|
33
|
+
"path": "test[0]"
|
|
34
|
+
}
|
|
35
|
+
]);
|
|
36
|
+
expect((0, diff_1.getDiff)({ test: [1] }, { test: [] })).toEqual([
|
|
37
|
+
{
|
|
38
|
+
"before": 1,
|
|
39
|
+
"beforeRaw": 1,
|
|
40
|
+
"index": 0,
|
|
41
|
+
"kind": "changed",
|
|
42
|
+
"path": "test[0]"
|
|
43
|
+
}
|
|
44
|
+
]);
|
|
45
|
+
});
|
|
46
|
+
//# sourceMappingURL=diff.spec.js.map
|
|
@@ -0,0 +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"}
|
package/build/index.d.ts
CHANGED
|
@@ -10,5 +10,5 @@ import { Eventable } from './mixins/Eventable';
|
|
|
10
10
|
import { Application } from './application/Application';
|
|
11
11
|
import { ApplicationModule } from './application/ApplicationModule';
|
|
12
12
|
import { bootstrap } from './bootstrap';
|
|
13
|
-
import { getDiff,
|
|
14
|
-
export { Entity, EntityId, ValueObject, AggregateRoot, HashError, DomainEvent, DomainEventSubscriber, EventBus, Eventable, Application, ApplicationModule, bootstrap, DiffViewModel,
|
|
13
|
+
import { getDiff, DiffFormatter, DiffViewModel } from './helpers/diff';
|
|
14
|
+
export { Entity, EntityId, ValueObject, AggregateRoot, HashError, DomainEvent, DomainEventSubscriber, EventBus, Eventable, Application, ApplicationModule, bootstrap, DiffViewModel, DiffFormatter, getDiff };
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAehC,uFAfO,eAAM,OAeP;AAdR,uCAAsC;AAepC,yFAfO,mBAAQ,OAeP;AAdV,6CAA4C;AAe1C,4FAfO,yBAAW,OAeP;AAdb,iDAAgD;AAe9C,8FAfO,6BAAa,OAeP;AAdf,+CAA8C;AAe5C,0FAfO,qBAAS,OAeP;AAdX,6CAA4C;AAe1C,4FAfO,yBAAW,OAeP;AAZb,gDAA+C;AAe7C,0FAfO,qBAAS,OAeP;AAdX,yDAAwD;AAgBtD,4FAhBO,yBAAW,OAgBP;AAfb,qEAAoE;AAgBlE,kGAhBO,qCAAiB,OAgBP;AAfnB,yCAAwC;AAiBtC,0FAjBO,qBAAS,OAiBP;AAhBX,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAehC,uFAfO,eAAM,OAeP;AAdR,uCAAsC;AAepC,yFAfO,mBAAQ,OAeP;AAdV,6CAA4C;AAe1C,4FAfO,yBAAW,OAeP;AAdb,iDAAgD;AAe9C,8FAfO,6BAAa,OAeP;AAdf,+CAA8C;AAe5C,0FAfO,qBAAS,OAeP;AAdX,6CAA4C;AAe1C,4FAfO,yBAAW,OAeP;AAZb,gDAA+C;AAe7C,0FAfO,qBAAS,OAeP;AAdX,yDAAwD;AAgBtD,4FAhBO,yBAAW,OAgBP;AAfb,qEAAoE;AAgBlE,kGAhBO,qCAAiB,OAgBP;AAfnB,yCAAwC;AAiBtC,0FAjBO,qBAAS,OAiBP;AAhBX,uCAAuE;AAoBrE,wFApBO,cAAO,OAoBP"}
|
package/package.json
CHANGED
package/src/Entity.spec.ts
CHANGED
|
@@ -106,22 +106,12 @@ describe('Entity', () => {
|
|
|
106
106
|
snapshot.name = 'changed';
|
|
107
107
|
}).toThrow();
|
|
108
108
|
const beforeSnapshot = entity.snapshot();
|
|
109
|
-
const formatter = {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
return undefined;
|
|
117
|
-
},
|
|
118
|
-
formatValue(value, { key }) {
|
|
119
|
-
if (value instanceof EntityId) {
|
|
120
|
-
return value.toHash();
|
|
121
|
-
}
|
|
122
|
-
if (key === 'amount' && typeof value === 'number') return `${value.toFixed(2)} грн`;
|
|
123
|
-
return String(value);
|
|
124
|
-
},
|
|
109
|
+
const formatter = (value, { key }) => {
|
|
110
|
+
if (value instanceof EntityId) {
|
|
111
|
+
return value.toHash();
|
|
112
|
+
}
|
|
113
|
+
if (key === 'amount' && typeof value === 'number') return `${value.toFixed(2)} грн`;
|
|
114
|
+
return String(value);
|
|
125
115
|
};
|
|
126
116
|
|
|
127
117
|
expect(entity.isDirty()).toEqual(false);
|
|
@@ -137,7 +127,6 @@ describe('Entity', () => {
|
|
|
137
127
|
"beforeRaw": "test",
|
|
138
128
|
"index": null,
|
|
139
129
|
"kind": "changed",
|
|
140
|
-
"label": "Імʼя",
|
|
141
130
|
"path": "name"
|
|
142
131
|
},
|
|
143
132
|
{
|
|
@@ -147,7 +136,6 @@ describe('Entity', () => {
|
|
|
147
136
|
"beforeRaw": 1000,
|
|
148
137
|
"index": 0,
|
|
149
138
|
"kind": "changed",
|
|
150
|
-
"label": "Ціна (позиція 1)",
|
|
151
139
|
"path": "parts[0].amount"
|
|
152
140
|
}
|
|
153
141
|
]);
|
package/src/EventBus.spec.ts
CHANGED
|
@@ -3,7 +3,6 @@ import {DomainEventSubscriber} from "./DomainEventSubscriber";
|
|
|
3
3
|
import {DomainEvent, DomainEventClass} from "./DomainEvent";
|
|
4
4
|
import {EntityId} from "./EntityId";
|
|
5
5
|
import {Entity} from "./Entity";
|
|
6
|
-
import {DiffFormatterOptions} from "./helpers/diff";
|
|
7
6
|
|
|
8
7
|
describe('EventBus', () => {
|
|
9
8
|
class NewUserCreated extends DomainEvent<{ username: string }> {
|
|
@@ -58,17 +57,6 @@ describe('EventBus', () => {
|
|
|
58
57
|
get username(): string {
|
|
59
58
|
return this.props.username;
|
|
60
59
|
}
|
|
61
|
-
|
|
62
|
-
toDiff(): DiffFormatterOptions | null {
|
|
63
|
-
return {
|
|
64
|
-
resolveLabel({ key }) {
|
|
65
|
-
return key;
|
|
66
|
-
},
|
|
67
|
-
formatValue(value) {
|
|
68
|
-
return value?.toString();
|
|
69
|
-
},
|
|
70
|
-
};
|
|
71
|
-
}
|
|
72
60
|
}
|
|
73
61
|
|
|
74
62
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import {getDiff} from "./diff";
|
|
2
|
+
|
|
3
|
+
test('getDiff', () => {
|
|
4
|
+
expect(getDiff({ test: '1' }, { test: '2' })).toEqual([
|
|
5
|
+
{
|
|
6
|
+
"after": "2",
|
|
7
|
+
"afterRaw": "2",
|
|
8
|
+
"before": "1",
|
|
9
|
+
"beforeRaw": "1",
|
|
10
|
+
"index": null,
|
|
11
|
+
"kind": "changed",
|
|
12
|
+
"path": "test"
|
|
13
|
+
}
|
|
14
|
+
]);
|
|
15
|
+
expect(getDiff({ test: [1] }, { test: [2] })).toEqual([
|
|
16
|
+
{
|
|
17
|
+
"after": 2,
|
|
18
|
+
"afterRaw": 2,
|
|
19
|
+
"before": 1,
|
|
20
|
+
"beforeRaw": 1,
|
|
21
|
+
"index": 0,
|
|
22
|
+
"kind": "changed",
|
|
23
|
+
"path": "test[0]"
|
|
24
|
+
}
|
|
25
|
+
]);
|
|
26
|
+
expect(getDiff({ test: [] }, { test: [2] })).toEqual([
|
|
27
|
+
{
|
|
28
|
+
"after": 2,
|
|
29
|
+
"afterRaw": 2,
|
|
30
|
+
"index": 0,
|
|
31
|
+
"kind": "changed",
|
|
32
|
+
"path": "test[0]"
|
|
33
|
+
}
|
|
34
|
+
]);
|
|
35
|
+
expect(getDiff({ test: [1] }, { test: [] })).toEqual([
|
|
36
|
+
{
|
|
37
|
+
"before": 1,
|
|
38
|
+
"beforeRaw": 1,
|
|
39
|
+
"index": 0,
|
|
40
|
+
"kind": "changed",
|
|
41
|
+
"path": "test[0]"
|
|
42
|
+
}
|
|
43
|
+
]);
|
|
44
|
+
});
|
package/src/helpers/diff.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import {EntityId} from "../EntityId";
|
|
2
|
+
|
|
1
3
|
export type DiffKind = 'added' | 'removed' | 'changed';
|
|
2
4
|
|
|
3
5
|
export type PathSegment =
|
|
@@ -20,20 +22,11 @@ export interface LabelContext {
|
|
|
20
22
|
entry: DiffEntry;
|
|
21
23
|
}
|
|
22
24
|
|
|
23
|
-
export
|
|
24
|
-
/**
|
|
25
|
-
* - string → label (людська назва поля)
|
|
26
|
-
* - null → ignore
|
|
27
|
-
* - undefined → fallback на path
|
|
28
|
-
*/
|
|
29
|
-
resolveLabel?: (ctx: LabelContext) => string | null | undefined;
|
|
30
|
-
|
|
31
|
-
formatValue?: (value: unknown, ctx: LabelContext) => string;
|
|
32
|
-
}
|
|
25
|
+
export type DiffFormatter = (value: unknown, ctx: LabelContext) => string;
|
|
33
26
|
|
|
34
27
|
export interface DiffViewModel {
|
|
35
28
|
kind: DiffKind;
|
|
36
|
-
|
|
29
|
+
field: string;
|
|
37
30
|
path: string;
|
|
38
31
|
index: number | null;
|
|
39
32
|
|
|
@@ -160,19 +153,14 @@ function buildLabelContext(entry: DiffEntry): LabelContext {
|
|
|
160
153
|
};
|
|
161
154
|
}
|
|
162
155
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
if (
|
|
166
|
-
|
|
167
|
-
if (typeof value === 'object') return JSON.stringify(value);
|
|
168
|
-
return String(value);
|
|
156
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
157
|
+
function defaultStringify(value: unknown): any {
|
|
158
|
+
if (value instanceof EntityId) return value.toJSON();
|
|
159
|
+
return value;
|
|
169
160
|
}
|
|
170
161
|
|
|
171
|
-
export function buildDiffViewModel(
|
|
172
|
-
|
|
173
|
-
options: DiffFormatterOptions
|
|
174
|
-
): DiffViewModel[] {
|
|
175
|
-
const { resolveLabel, formatValue = defaultStringify } = options;
|
|
162
|
+
export function buildDiffViewModel(diffs: DiffEntry[], formatValue?: DiffFormatter): DiffViewModel[] {
|
|
163
|
+
const formatter = formatValue || defaultStringify;
|
|
176
164
|
|
|
177
165
|
const seen = new Set<string>();
|
|
178
166
|
const result: DiffViewModel[] = [];
|
|
@@ -180,16 +168,8 @@ export function buildDiffViewModel(
|
|
|
180
168
|
for (const entry of diffs) {
|
|
181
169
|
const ctx = buildLabelContext(entry);
|
|
182
170
|
|
|
183
|
-
const
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
const label = resolvedLabel ?? entry.path;
|
|
187
|
-
|
|
188
|
-
const beforeFormatted =
|
|
189
|
-
entry.before !== undefined ? formatValue(entry.before, ctx) : undefined;
|
|
190
|
-
|
|
191
|
-
const afterFormatted =
|
|
192
|
-
entry.after !== undefined ? formatValue(entry.after, ctx) : undefined;
|
|
171
|
+
const beforeFormatted = entry.before !== undefined ? formatter(entry.before, ctx) : undefined;
|
|
172
|
+
const afterFormatted = entry.after !== undefined ? formatter(entry.after, ctx) : undefined;
|
|
193
173
|
|
|
194
174
|
// якщо форматовано однаково — не зміна
|
|
195
175
|
if (entry.kind === 'changed' && beforeFormatted === afterFormatted) {
|
|
@@ -205,8 +185,8 @@ export function buildDiffViewModel(
|
|
|
205
185
|
seen.add(dedupeKey);
|
|
206
186
|
|
|
207
187
|
result.push({
|
|
188
|
+
field: ctx.key || ctx.path,
|
|
208
189
|
kind: entry.kind,
|
|
209
|
-
label,
|
|
210
190
|
path: entry.path,
|
|
211
191
|
index: ctx.index,
|
|
212
192
|
beforeRaw: entry.before,
|
|
@@ -223,9 +203,9 @@ export function buildDiffViewModel(
|
|
|
223
203
|
* Повертає diff у вигляді масиву обʼєктів (DiffViewModel),
|
|
224
204
|
*/
|
|
225
205
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
226
|
-
export function getDiff(beforeObj: any, afterObj: any,
|
|
206
|
+
export function getDiff(beforeObj: any, afterObj: any, formatter?: DiffFormatter): DiffViewModel[] | null {
|
|
227
207
|
const diffs = diffObjects(beforeObj, afterObj);
|
|
228
208
|
if (diffs.length === 0) return null;
|
|
229
209
|
|
|
230
|
-
return buildDiffViewModel(diffs,
|
|
210
|
+
return buildDiffViewModel(diffs, formatter);
|
|
231
211
|
}
|
package/src/index.ts
CHANGED
|
@@ -10,7 +10,7 @@ import { Eventable } from './mixins/Eventable';
|
|
|
10
10
|
import { Application } from './application/Application';
|
|
11
11
|
import { ApplicationModule } from './application/ApplicationModule';
|
|
12
12
|
import { bootstrap } from './bootstrap';
|
|
13
|
-
import { getDiff,
|
|
13
|
+
import { getDiff, DiffFormatter, DiffViewModel } from './helpers/diff';
|
|
14
14
|
|
|
15
15
|
export {
|
|
16
16
|
Entity,
|
|
@@ -29,6 +29,6 @@ export {
|
|
|
29
29
|
bootstrap,
|
|
30
30
|
|
|
31
31
|
DiffViewModel,
|
|
32
|
-
|
|
32
|
+
DiffFormatter,
|
|
33
33
|
getDiff
|
|
34
34
|
}
|