@pocket-architect/core 0.1.23 → 0.1.27

package/build/Entity.d.ts

@@ -4,7 +4,6 @@ export declare abstract class Entity<T, E, H extends EntityId<E>> {
     protected props: T;
     protected _snapshot: string;
     snapshot(): T;
-    snapshotDiff(): Partial<T> | null;
     isDirty(): boolean;
     protected constructor(props: T, id?: H | E);
     equals(object?: Entity<T, E, H>): boolean;

package/build/Entity.js

@@ -17,25 +17,13 @@ var Entity = /** @class */ (function () {
         this.props = props;
     }
     Entity.prototype.snapshot = function () {
-        this._snapshot = JSON.stringify(this.props);
+        // важливо: snapshot має бути стабільним (createSnapshot)
+        var snapObj = (0, helpers_1.createSnapshot)(this.props);
+        this._snapshot = JSON.stringify(snapObj);
         var copy = JSON.parse(this._snapshot);
         Object.freeze(copy);
         return copy;
     };
-    Entity.prototype.snapshotDiff = function () {
-        if (!this._snapshot) {
-            return null;
-        }
-        var diffs = {};
-        var copy = JSON.parse(this._snapshot);
-        var snapshotObj = (0, helpers_1.createSnapshot)(this.props);
-        for (var key in this.props) {
-            if (JSON.stringify(snapshotObj[key]) !== JSON.stringify(copy[key])) {
-                diffs[key] = this.props[key];
-            }
-        }
-        return Object.keys(diffs).length > 0 ? diffs : null;
-    };
     Entity.prototype.isDirty = function () {
         if (!this._snapshot) {
             return false;

package/build/Entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../src/Entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../src/Entity.ts"],"names":[],"mappings":";;;AAAA,uCAAsC;AACtC,qCAAyC;AAEzC,IAAM,QAAQ,GAAG,UAA8B,CAAkB;IAC/D,OAAO,CAAC,YAAY,MAAM,CAAA;AAC5B,CAAC,CAAA;AAED;IAsBE,gBAAsB,KAAQ,EAAE,EAAQ;QACtC,IAAI,EAAE,EAAE,CAAC;YACP,IAAI,CAAC,GAAG,GAAM,CAAC,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,mBAAQ,CAAI,EAAE,CAAC,CAAC,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,GAAM,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;IAxBD,yBAAQ,GAAR;QACE,yDAAyD;QACzD,IAAM,OAAO,GAAG,IAAA,wBAAc,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAEzC,IAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAM,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAO,GAAP;QACE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,CAAC,IAAA,wBAAc,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACvE,CAAC;IAWM,uBAAM,GAAb,UAAc,MAAwB;QACpC,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC5C,OAAO,KAAK,CAAA;QACd,CAAC;QAED,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACtB,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IAED,sBAAI,sBAAE;aAAN;YACE,OAAO,IAAI,CAAC,GAAG,CAAA;QACjB,CAAC;;;OAAA;IAED,4BAAW,GAAX;QACE,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,8DAA8D;IAC9D,uBAAM,GAAN;QACE,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC;IAED,8DAA8D;IAC9D,2BAAU,GAAV;QACE,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC;IACH,aAAC;AAAD,CAAC,AAhED,IAgEC;AAhEqB,wBAAM"}

package/build/Entity.spec.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var Entity_1 = require("./Entity");
 var EntityId_1 = require("./EntityId");
+var diff_1 = require("./helpers/diff");
 var TestEntity = /** @class */ (function (_super) {
     tslib_1.__extends(TestEntity, _super);
     function TestEntity() {
@@ -25,26 +26,58 @@ var TestEntity = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    TestEntity.prototype.setFirstAmount = function (amount) {
+        this.props.parts[0].amount = amount;
+    };
     return TestEntity;
 }(Entity_1.Entity));
+var TestEntity2 = /** @class */ (function (_super) {
+    tslib_1.__extends(TestEntity2, _super);
+    function TestEntity2() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    TestEntity2.create = function (props, id) {
+        return new TestEntity2(props, id);
+    };
+    return TestEntity2;
+}(Entity_1.Entity));
 describe('Entity', function () {
     var entity;
     beforeAll(function () {
-        entity = TestEntity.create({ name: 'test', testId: new EntityId_1.EntityId('1') }, '1');
+        entity = TestEntity.create({
+            name: 'test', testId: new EntityId_1.EntityId('1'),
+            test2: TestEntity2.create({ name: 'test', testId: new EntityId_1.EntityId('1') }),
+            parts: [{
+                    amount: 1000,
+                    entity: TestEntity2.create({ name: 'part entity', testId: new EntityId_1.EntityId('2') })
+                }]
+        }, '1');
     });
     test('base', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
         var entityNew, entity2, entity3;
         return tslib_1.__generator(this, function (_a) {
-            entityNew = TestEntity.create({ name: 'test2' });
+            entityNew = TestEntity.create({
+                name: 'test2',
+                test2: TestEntity2.create({ name: 'test', testId: new EntityId_1.EntityId('1') }),
+                parts: []
+            });
             expect(entityNew.id.toString().length).toEqual(36); // random id
-            entity2 = TestEntity.create({ name: 'test2' }, '1');
+            entity2 = TestEntity.create({
+                name: 'test2',
+                test2: TestEntity2.create({ name: 'test', testId: new EntityId_1.EntityId('1') }),
+                parts: []
+            }, '1');
             expect(entity.equals(entity2)).toBeTruthy(); // same id
             expect(entity.equals(entity)).toBeTruthy(); // same instance
             expect(entity.equals(null)).toBeFalsy(); // null
             expect(entity.equals({ id: new EntityId_1.EntityId('1') })).toBeFalsy(); // not Entity
             expect(entity.id.toPrimitive()).toEqual('1');
             expect(entity.id.toString()).toEqual('6061cf31-edcb-5d22-9adc-927af7c186fa');
-            entity3 = TestEntity.create({ name: 'test2' }, entity.id);
+            entity3 = TestEntity.create({
+                name: 'test2',
+                test2: TestEntity2.create({ name: 'test', testId: new EntityId_1.EntityId('1') }),
+                parts: []
+            }, entity.id);
             expect(entity.equals(entity3)).toBeTruthy(); // same id
             expect(entity3.id.toPrimitive()).toEqual('1');
             expect(entity3.id.toString()).toEqual('6061cf31-edcb-5d22-9adc-927af7c186fa');
@@ -52,18 +85,78 @@ describe('Entity', function () {
         });
     }); });
     test('snapshot', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var snapshot;
+        var snapshot, beforeSnapshot, formatter;
         return tslib_1.__generator(this, function (_a) {
             snapshot = entity.snapshot();
-            expect(snapshot).toEqual({ name: 'test', testId: '3D4WX' });
+            expect(snapshot).toEqual({
+                "name": "test",
+                "parts": [
+                    {
+                        "amount": 1000,
+                        "entity": {
+                            "name": "part entity",
+                            "testId": "QbPvX"
+                        }
+                    }
+                ],
+                "test2": {
+                    "name": "test",
+                    "testId": "3D4WX"
+                },
+                "testId": "3D4WX"
+            });
             expect(function () {
                 snapshot.name = 'changed';
             }).toThrow();
+            beforeSnapshot = entity.snapshot();
+            formatter = {
+                resolveLabel: function (_a) {
+                    var key = _a.key, index = _a.index, path = _a.path;
+                    if (key === 'createdAt')
+                        return null; // ignore
+                    if (key === 'amount' && index !== null)
+                        return "\u0426\u0456\u043D\u0430 (\u043F\u043E\u0437\u0438\u0446\u0456\u044F ".concat(index + 1, ")");
+                    if (path === 'name')
+                        return 'Імʼя';
+                    return undefined;
+                },
+                formatValue: function (value, _a) {
+                    var key = _a.key;
+                    if (value instanceof EntityId_1.EntityId) {
+                        return value.toHash();
+                    }
+                    if (key === 'amount' && typeof value === 'number')
+                        return "".concat(value.toFixed(2), " \u0433\u0440\u043D");
+                    return String(value);
+                },
+            };
             expect(entity.isDirty()).toEqual(false);
-            expect(entity.snapshotDiff()).toEqual(null);
+            expect((0, diff_1.getDiff)(beforeSnapshot, entity.snapshot(), formatter)).toEqual(null);
             entity.name = 'test changed';
+            entity.setFirstAmount(200);
             expect(entity.isDirty()).toEqual(true);
-            expect(entity.snapshotDiff()).toEqual({ "name": "test changed" });
+            expect((0, diff_1.getDiff)(beforeSnapshot, entity.snapshot(), formatter)).toEqual([
+                {
+                    "after": "test changed",
+                    "afterRaw": "test changed",
+                    "before": "test",
+                    "beforeRaw": "test",
+                    "index": null,
+                    "kind": "changed",
+                    "label": "Імʼя",
+                    "path": "name"
+                },
+                {
+                    "after": "200.00 грн",
+                    "afterRaw": 200,
+                    "before": "1000.00 грн",
+                    "beforeRaw": 1000,
+                    "index": 0,
+                    "kind": "changed",
+                    "label": "Ціна (позиція 1)",
+                    "path": "parts[0].amount"
+                }
+            ]);
             return [2 /*return*/];
         });
     }); });

package/build/Entity.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"Entity.spec.js","sourceRoot":"","sources":["../src/Entity.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Entity.spec.js","sourceRoot":"","sources":["../src/Entity.spec.ts"],"names":[],"mappings":"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"}

package/build/EntityId.js

@@ -58,7 +58,7 @@ var EntityId = /** @class */ (function () {
         return this._uuid;
     };
     EntityId.prototype.toJSON = function () {
-        return this.toHash();
+        return this._recordId ? this.toHash() : null;
     };
     EntityId.prototype.equals = function (id) {
         return this._uuid === id._uuid;

package/build/EntityId.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityId.js","sourceRoot":"","sources":["../src/EntityId.ts"],"names":[],"mappings":";;;;AAAA,0EAAuC;AACvC,8CAA+C;AAC/C,4DAA8B;AAC9B,+CAA4C;AAE5C;IAIE,kBAAY,QAAyB,EAAE,MAAsB,EAAE,IAAmB;QAAtE,yBAAA,EAAA,eAAyB;QAAE,uBAAA,EAAA,cAAsB;QAAE,qBAAA,EAAA,WAAmB;QAHxE,cAAS,GAAW,IAAI,CAAC;QACzB,UAAK,GAAW,IAAI,CAAC;QAG7B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAa,CAAC,CAAC,CAAC,IAAI,CAAC;QACjD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,QAAQ,CAAC,QAAkB,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;IAEO,6BAAU,GAAlB;QACE,IAAI,CAAC,KAAK,GAAG,IAAA,wBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAA,gBAAQ,GAAE,EAAE,IAAA,wBAAU,EAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACtH,CAAC;IAED,sBAAI,iCAAW;aAAf;YACE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACpC,CAAC;;;OAAA;IAED,yBAAM,GAAN;QACE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACnD,CAAC;QACD,IAAM,OAAO,QAAO,iBAAO,YAAP,iBAAO,kCAAI,IAAI,CAAC,WAAW,YAAC,CAAC;QACjD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;IAES,2BAAQ,GAAlB,UAAmB,IAAY;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAM,OAAO,QAAO,iBAAO,YAAP,iBAAO,kCAAI,IAAI,CAAC,WAAW,YAAC,CAAC;QACjD,IAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,qBAAS,CAAC,uBAAgB,IAAI,CAAE,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,SAAS,GAAM,CAAC,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAChF,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,8BAAW,GAAX;QACE,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,2BAAQ,GAAR;QACE,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,yBAAM,GAAN;QACE,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAED,yBAAM,GAAN,UAAO,EAAe;QACpB,OAAO,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC,KAAK,CAAC;IACjC,CAAC;IACH,eAAC;AAAD,CAAC,AA3DD,IA2DC;AA3DY,4BAAQ"}
+{"version":3,"file":"EntityId.js","sourceRoot":"","sources":["../src/EntityId.ts"],"names":[],"mappings":";;;;AAAA,0EAAuC;AACvC,8CAA+C;AAC/C,4DAA8B;AAC9B,+CAA4C;AAE5C;IAIE,kBAAY,QAAyB,EAAE,MAAsB,EAAE,IAAmB;QAAtE,yBAAA,EAAA,eAAyB;QAAE,uBAAA,EAAA,cAAsB;QAAE,qBAAA,EAAA,WAAmB;QAHxE,cAAS,GAAW,IAAI,CAAC;QACzB,UAAK,GAAW,IAAI,CAAC;QAG7B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAa,CAAC,CAAC,CAAC,IAAI,CAAC;QACjD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,QAAQ,CAAC,QAAkB,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;IAEO,6BAAU,GAAlB;QACE,IAAI,CAAC,KAAK,GAAG,IAAA,wBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAA,gBAAQ,GAAE,EAAE,IAAA,wBAAU,EAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACtH,CAAC;IAED,sBAAI,iCAAW;aAAf;YACE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACpC,CAAC;;;OAAA;IAED,yBAAM,GAAN;QACE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACnD,CAAC;QACD,IAAM,OAAO,QAAO,iBAAO,YAAP,iBAAO,kCAAI,IAAI,CAAC,WAAW,YAAC,CAAC;QACjD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;IAES,2BAAQ,GAAlB,UAAmB,IAAY;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAM,OAAO,QAAO,iBAAO,YAAP,iBAAO,kCAAI,IAAI,CAAC,WAAW,YAAC,CAAC;QACjD,IAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,qBAAS,CAAC,uBAAgB,IAAI,CAAE,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,SAAS,GAAM,CAAC,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAChF,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,8BAAW,GAAX;QACE,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,2BAAQ,GAAR;QACE,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,yBAAM,GAAN;QACE,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,CAAC;IAED,yBAAM,GAAN,UAAO,EAAe;QACpB,OAAO,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC,KAAK,CAAC;IACjC,CAAC;IACH,eAAC;AAAD,CAAC,AA3DD,IA2DC;AA3DY,4BAAQ"}

package/build/EventBus.spec.js

@@ -88,18 +88,30 @@ describe('EventBus', function () {
                             enumerable: false,
                             configurable: true
                         });
+                        User.prototype.toDiff = function () {
+                            return {
+                                resolveLabel: function (_a) {
+                                    var key = _a.key;
+                                    return key;
+                                },
+                                formatValue: function (value) {
+                                    return value === null || value === void 0 ? void 0 : value.toString();
+                                },
+                            };
+                        };
                         return User;
                     }(Entity_1.Entity));
                     UserCreatedEvent = /** @class */ (function (_super) {
                         tslib_1.__extends(UserCreatedEvent, _super);
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         function UserCreatedEvent() {
                             var _this = _super !== null && _super.apply(this, arguments) || this;
                             _this.eventName = 'UserCreatedEvent'; // без цього не буде працювати статична типізація
                             return _this;
                         }
-                        Object.defineProperty(UserCreatedEvent.prototype, "username", {
+                        Object.defineProperty(UserCreatedEvent.prototype, "diff", {
                             get: function () {
-                                return this.props.username;
+                                return this.props.diff;
                             },
                             enumerable: false,
                             configurable: true
@@ -117,7 +129,9 @@ describe('EventBus', function () {
                         ChangeLoggerSubscriber.prototype.on = function (domainEvent) {
                             return tslib_1.__awaiter(this, void 0, void 0, function () {
                                 return tslib_1.__generator(this, function (_a) {
-                                    console.log('Username changed:', domainEvent.username);
+                                    expect(domainEvent.diff).toEqual([
+                                        { test: 1 }
+                                    ]);
                                     return [2 /*return*/];
                                 });
                             });
@@ -133,11 +147,12 @@ describe('EventBus', function () {
                     user.snapshot();
                     // Змінюємо ім'я користувача
                     user.username = 'john_doe_updated';
+                    expect(user.isDirty()).toBeTruthy();
                     // Перевіряємо, чи є зміни
                     if (user.isDirty()) {
-                        diff = user.snapshotDiff();
+                        diff = [{ test: 1 }];
                         if (diff) {
-                            event = new UserCreatedEvent(diff);
+                            event = new UserCreatedEvent({ diff: diff });
                             // записуємо подію в чергу (не publish). Бо якщо в циклі може бути багато подій і їх треба назбирати, а потім виконати, тому збираємо через push
                             eventBus.push(event);
                         }

package/build/EventBus.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventBus.spec.js","sourceRoot":"","sources":["../src/EventBus.spec.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAE7D,6CAA4D;AAC5D,uCAAoC;AACpC,mCAAgC;AAEhC,QAAQ,CAAC,UAAU,EAAE;IACnB;QAA6B,0CAAiC;QAA9D;;QACA,CAAC;QAAD,qBAAC;IAAD,CAAC,AADD,CAA6B,yBAAW,GACvC;IACD;QAA8B,2CAAiC;QAA/D;;QAEA,CAAC;QADQ,0BAAU,GAAG,QAAQ,CAAC;QAC/B,sBAAC;KAAA,AAFD,CAA8B,yBAAW,GAExC;IAED;QAAA;QAOA,CAAC;QANC,wCAAY,GAAZ;YACE,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAC3C,CAAC;QACK,8BAAE,GAAR,UAAS,WAA2C;;;oBAClD,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;;;;SAC7C;QACH,wBAAC;IAAD,CAAC,AAPD,IAOC;IAED,IAAI,CAAC,WAAW,EAAE;;;;;oBACV,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;oBAClD,iBAAiB,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;oBAC3B,GAAG,GAAG,IAAI,mCAAgB,EAAE,CAAC;oBACnC,GAAG,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;oBAElC,KAAK,GAAG,IAAI,cAAc,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;oBACjD,MAAM,GAAG,IAAI,eAAe,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;oBAE1D,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;oBAClD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAE3C,qBAAM,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,EAAA;;oBAAlC,SAAkC,CAAC;oBAEnC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;;;;SACvD,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc,EAAE;;;;;oBACnB;wBAAqB,kCAAgB;wBAArC;;wBAAuC,CAAC;wBAAD,aAAC;oBAAD,CAAC,AAAxC,CAAqB,mBAAQ,GAAW;oBAOxC;wBAAmB,gCAA6B;wBAAhD;;wBAYA,CAAC;wBAXQ,WAAM,GAAb,UAAc,KAAY;4BACxB,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;wBACnC,CAAC;wBAED,sBAAI,0BAAQ;iCAIZ;gCACE,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;4BAC7B,CAAC;iCAND,UAAa,QAAgB;gCAC3B,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;4BACjC,CAAC;;;2BAAA;wBAKH,WAAC;oBAAD,CAAC,AAZD,CAAmB,eAAM,GAYxB;oBAED;wBAA+B,4CAA2B;wBAA1D;;4BACW,eAAS,GAAG,kBAAkB,CAAC,CAAC,iDAAiD;;wBAK5F,CAAC;wBAHC,sBAAI,sCAAQ;iCAAZ;gCACE,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;4BAC7B,CAAC;;;2BAAA;wBACH,uBAAC;oBAAD,CAAC,AAND,CAA+B,yBAAW,GAMzC;oBAED;wBAAA;wBAUA,CAAC;wBATC,2CAA2C;wBAC3C,6CAAY,GAAZ;4BACE,OAAO,CAAC,gBAAgB,CAAC,CAAC;wBAC5B,CAAC;wBAED,kCAAkC;wBAC5B,mCAAE,GAAR,UAAS,WAA6B;;;oCACpC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;;;;yBACxD;wBACH,6BAAC;oBAAD,CAAC,AAVD,IAUC;oBAGK,QAAQ,GAAG,IAAI,mCAAgB,EAAE,CAAC;oBAClC,UAAU,GAAG,IAAI,sBAAsB,EAAE,CAAC;oBAC1C,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;oBAC5C,QAAQ,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;oBAEhC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;oBACxE,qCAAqC;oBACrC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAChB,4BAA4B;oBAC5B,IAAI,CAAC,QAAQ,GAAG,kBAAkB,CAAC;oBAEnC,0BAA0B;oBAC1B,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;wBACb,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;wBACjC,IAAI,IAAI,EAAE,CAAC;4BACT,KAAK,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;4BACnC,gJAAgJ;4BAChJ,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;wBACvB,CAAC;oBACH,CAAC;oBACD,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;oBACtC,+BAA+B;oBAC/B,qBAAM,QAAQ,CAAC,OAAO,EAAE,EAAA;;oBADxB,+BAA+B;oBAC/B,SAAwB,CAAC;oBACzB,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;;;;SAC5C,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"EventBus.spec.js","sourceRoot":"","sources":["../src/EventBus.spec.ts"],"names":[],"mappings":"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"}

package/build/helpers/diff.d.ts

@@ -0,0 +1,47 @@
+export type DiffKind = 'added' | 'removed' | 'changed';
+export type PathSegment = {
+    type: 'key';
+    key: string;
+} | {
+    type: 'index';
+    index: number;
+};
+export interface DiffEntry {
+    path: string;
+    segments: PathSegment[];
+    kind: DiffKind;
+    before?: unknown;
+    after?: unknown;
+}
+export interface LabelContext {
+    key: string | null;
+    index: number | null;
+    path: string;
+    segments: PathSegment[];
+    entry: DiffEntry;
+}
+export interface DiffFormatterOptions {
+    /**
+     * - string → label (людська назва поля)
+     * - null → ignore
+     * - undefined → fallback на path
+     */
+    resolveLabel?: (ctx: LabelContext) => string | null | undefined;
+    formatValue?: (value: unknown, ctx: LabelContext) => string;
+}
+export interface DiffViewModel {
+    kind: DiffKind;
+    label: string;
+    path: string;
+    index: number | null;
+    beforeRaw?: unknown;
+    afterRaw?: unknown;
+    before?: string;
+    after?: string;
+}
+export declare function diffObjects(before: unknown, after: unknown): DiffEntry[];
+export declare function buildDiffViewModel(diffs: DiffEntry[], options: DiffFormatterOptions): DiffViewModel[];
+/**
+ * Повертає diff у вигляді масиву обʼєктів (DiffViewModel),
+ */
+export declare function getDiff(beforeObj: any, afterObj: any, diffOptions: DiffFormatterOptions): DiffViewModel[] | null;

package/build/helpers/diff.js

@@ -0,0 +1,165 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDiff = exports.buildDiffViewModel = exports.diffObjects = void 0;
+var tslib_1 = require("tslib");
+function diffObjects(before, after) {
+    var diffs = [];
+    walk(before, after, [], diffs);
+    return diffs;
+}
+exports.diffObjects = diffObjects;
+function walk(before, after, segments, out) {
+    if (Object.is(before, after))
+        return;
+    var isPlainObject = function (v) {
+        return typeof v === 'object' && v !== null && !Array.isArray(v);
+    };
+    // arrays
+    if (Array.isArray(before) || Array.isArray(after)) {
+        var bArr = Array.isArray(before) ? before : [];
+        var aArr = Array.isArray(after) ? after : [];
+        var max = Math.max(bArr.length, aArr.length);
+        for (var i = 0; i < max; i++) {
+            walk(bArr[i], aArr[i], tslib_1.__spreadArray(tslib_1.__spreadArray([], segments, true), [{ type: 'index', index: i }], false), out);
+        }
+        return;
+    }
+    // primitives or mismatched types
+    if (!isPlainObject(before) || !isPlainObject(after)) {
+        out.push({
+            path: segmentsToPath(segments),
+            segments: segments,
+            kind: 'changed',
+            before: before,
+            after: after,
+        });
+        return;
+    }
+    // objects
+    var bObj = before;
+    var aObj = after;
+    var keys = tslib_1.__spreadArray(tslib_1.__spreadArray([], Object.keys(bObj), true), Object.keys(aObj), true);
+    for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+        var key = keys_1[_i];
+        var b = bObj[key];
+        var a = aObj[key];
+        var nextSeg = tslib_1.__spreadArray(tslib_1.__spreadArray([], segments, true), [{ type: 'key', key: key }], false);
+        if (b === undefined && a !== undefined) {
+            out.push({
+                path: segmentsToPath(nextSeg),
+                segments: nextSeg,
+                kind: 'added',
+                after: a,
+            });
+            continue;
+        }
+        if (b !== undefined && a === undefined) {
+            out.push({
+                path: segmentsToPath(nextSeg),
+                segments: nextSeg,
+                kind: 'removed',
+                before: b,
+            });
+            continue;
+        }
+        walk(b, a, nextSeg, out);
+    }
+}
+function segmentsToPath(segments) {
+    var path = '';
+    for (var _i = 0, segments_1 = segments; _i < segments_1.length; _i++) {
+        var s = segments_1[_i];
+        if (s.type === 'key') {
+            path += path ? ".".concat(s.key) : s.key;
+        }
+        else {
+            path += "[".concat(s.index, "]");
+        }
+    }
+    return path || '';
+}
+function buildLabelContext(entry) {
+    var key = null;
+    var index = null;
+    for (var i = entry.segments.length - 1; i >= 0; i--) {
+        var s = entry.segments[i];
+        if (s.type === 'key') {
+            key = s.key;
+            break;
+        }
+    }
+    for (var i = entry.segments.length - 1; i >= 0; i--) {
+        var s = entry.segments[i];
+        if (s.type === 'index') {
+            index = s.index;
+            break;
+        }
+    }
+    return {
+        key: key,
+        index: index,
+        path: entry.path,
+        segments: entry.segments,
+        entry: entry,
+    };
+}
+function defaultStringify(value) {
+    if (typeof value === 'string')
+        return "\"".concat(value, "\"");
+    if (typeof value === 'boolean')
+        return value ? 'true' : 'false';
+    if (value === null)
+        return 'null';
+    if (typeof value === 'object')
+        return JSON.stringify(value);
+    return String(value);
+}
+function buildDiffViewModel(diffs, options) {
+    var resolveLabel = options.resolveLabel, _a = options.formatValue, formatValue = _a === void 0 ? defaultStringify : _a;
+    var seen = new Set();
+    var result = [];
+    for (var _i = 0, diffs_1 = diffs; _i < diffs_1.length; _i++) {
+        var entry = diffs_1[_i];
+        var ctx = buildLabelContext(entry);
+        var resolvedLabel = resolveLabel === null || resolveLabel === void 0 ? void 0 : resolveLabel(ctx);
+        if (resolvedLabel === null)
+            continue;
+        var label = resolvedLabel !== null && resolvedLabel !== void 0 ? resolvedLabel : entry.path;
+        var beforeFormatted = entry.before !== undefined ? formatValue(entry.before, ctx) : undefined;
+        var afterFormatted = entry.after !== undefined ? formatValue(entry.after, ctx) : undefined;
+        // якщо форматовано однаково — не зміна
+        if (entry.kind === 'changed' && beforeFormatted === afterFormatted) {
+            continue;
+        }
+        // 👇 КЛЮЧ ДЕДУПЛІКАЦІЇ
+        var dedupeKey = "".concat(entry.kind, "|").concat(entry.path);
+        if (seen.has(dedupeKey)) {
+            continue;
+        }
+        seen.add(dedupeKey);
+        result.push({
+            kind: entry.kind,
+            label: label,
+            path: entry.path,
+            index: ctx.index,
+            beforeRaw: entry.before,
+            afterRaw: entry.after,
+            before: beforeFormatted,
+            after: afterFormatted,
+        });
+    }
+    return result;
+}
+exports.buildDiffViewModel = buildDiffViewModel;
+/**
+ * Повертає diff у вигляді масиву обʼєктів (DiffViewModel),
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function getDiff(beforeObj, afterObj, diffOptions) {
+    var diffs = diffObjects(beforeObj, afterObj);
+    if (diffs.length === 0)
+        return null;
+    return buildDiffViewModel(diffs, diffOptions);
+}
+exports.getDiff = getDiff;
+//# sourceMappingURL=diff.js.map

package/build/helpers/diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/helpers/diff.ts"],"names":[],"mappings":";;;;AA8CA,SAAgB,WAAW,CAAC,MAAe,EAAE,KAAc;IACzD,IAAM,KAAK,GAAgB,EAAE,CAAC;IAC9B,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;IAC/B,OAAO,KAAK,CAAC;AACf,CAAC;AAJD,kCAIC;AAED,SAAS,IAAI,CACX,MAAe,EACf,KAAc,EACd,QAAuB,EACvB,GAAgB;IAEhB,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC;QAAE,OAAO;IAErC,IAAM,aAAa,GAAG,UAAC,CAAU;QAC/B,OAAA,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAAxD,CAAwD,CAAC;IAE3D,SAAS;IACT,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,IAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,IAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,IAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,kDAAM,QAAQ,UAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,WAAG,GAAG,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO;IACT,CAAC;IAED,iCAAiC;IACjC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,GAAG,CAAC,IAAI,CAAC;YACP,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;YAC9B,QAAQ,UAAA;YACR,IAAI,EAAE,SAAS;YACf,MAAM,QAAA;YACN,KAAK,OAAA;SACN,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,UAAU;IACV,IAAM,IAAI,GAAG,MAAiC,CAAC;IAC/C,IAAM,IAAI,GAAG,KAAgC,CAAC;IAC9C,IAAM,IAAI,mDAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAC,CAAC;IAE1D,KAAkB,UAAI,EAAJ,aAAI,EAAJ,kBAAI,EAAJ,IAAI,EAAE,CAAC;QAApB,IAAM,GAAG,aAAA;QACZ,IAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACpB,IAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACpB,IAAM,OAAO,mDAAO,QAAQ,UAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAA,EAAW,SAAC,CAAC;QAE7D,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YACvC,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC;gBAC7B,QAAQ,EAAE,OAAO;gBACjB,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,CAAC;aACT,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YACvC,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC;gBAC7B,QAAQ,EAAE,OAAO;gBACjB,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,CAAC;aACV,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,QAAuB;IAC7C,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,KAAgB,UAAQ,EAAR,qBAAQ,EAAR,sBAAQ,EAAR,IAAQ,EAAE,CAAC;QAAtB,IAAM,CAAC,iBAAA;QACV,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YACrB,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,WAAI,CAAC,CAAC,GAAG,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,WAAI,CAAC,CAAC,KAAK,MAAG,CAAC;QACzB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAgB;IACzC,IAAI,GAAG,GAAkB,IAAI,CAAC;IAC9B,IAAI,KAAK,GAAkB,IAAI,CAAC;IAEhC,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACpD,IAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YACrB,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;YACZ,MAAM;QACR,CAAC;IACH,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACpD,IAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACvB,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YAChB,MAAM;QACR,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,KAAA;QACH,KAAK,OAAA;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,OAAA;KACN,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,YAAI,KAAK,OAAG,CAAC;IACnD,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAChE,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IAClC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAgB,kBAAkB,CAChC,KAAkB,EAClB,OAA6B;IAErB,IAAA,YAAY,GAAqC,OAAO,aAA5C,EAAE,KAAmC,OAAO,YAAZ,EAA9B,WAAW,mBAAG,gBAAgB,KAAA,CAAa;IAEjE,IAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,IAAM,MAAM,GAAoB,EAAE,CAAC;IAEnC,KAAoB,UAAK,EAAL,eAAK,EAAL,mBAAK,EAAL,IAAK,EAAE,CAAC;QAAvB,IAAM,KAAK,cAAA;QACd,IAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAErC,IAAM,aAAa,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,GAAG,CAAC,CAAC;QAC1C,IAAI,aAAa,KAAK,IAAI;YAAE,SAAS;QAErC,IAAM,KAAK,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,KAAK,CAAC,IAAI,CAAC;QAE1C,IAAM,eAAe,GACnB,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1E,IAAM,cAAc,GAClB,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAExE,uCAAuC;QACvC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,eAAe,KAAK,cAAc,EAAE,CAAC;YACnE,SAAS;QACX,CAAC;QAED,uBAAuB;QACvB,IAAM,SAAS,GAAG,UAAG,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,IAAI,CAAE,CAAC;QAEhD,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACxB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEpB,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,OAAA;YACL,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,SAAS,EAAE,KAAK,CAAC,MAAM;YACvB,QAAQ,EAAE,KAAK,CAAC,KAAK;YACrB,MAAM,EAAE,eAAe;YACvB,KAAK,EAAE,cAAc;SACtB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAjDD,gDAiDC;AAED;;GAEG;AACH,8DAA8D;AAC9D,SAAgB,OAAO,CAAC,SAAc,EAAE,QAAa,EAAE,WAAiC;IACtF,IAAM,KAAK,GAAG,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEpC,OAAO,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AAChD,CAAC;AALD,0BAKC"}

package/build/helpers.js

@@ -3,33 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSnapshot = void 0;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function createSnapshot(obj) {
-    if (!obj) {
+    if (obj === null || obj === undefined) {
         return obj;
     }
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
+    // toSnapshot має найвищий пріоритет
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     if (typeof obj.toSnapshot === 'function') {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         return obj.toSnapshot();
     }
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     if (typeof obj.toJSON === 'function') {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         return obj.toJSON();
     }
+    // ✅ МАСИВИ
+    if (Array.isArray(obj)) {
+        return obj.map(function (item) { return createSnapshot(item); });
+    }
+    // primitives
+    if (typeof obj !== 'object') {
+        return obj;
+    }
+    // plain object
     var copy = {};
-    for (var key in obj) {
-        if (!Object.prototype.hasOwnProperty.call(obj, key)) {
-            continue;
-        }
-        if (typeof obj[key] !== 'object') {
-            copy[key] = obj[key];
-            continue;
-        }
-        copy[key] = createSnapshot(obj[key]);
+    for (var _i = 0, _a = Object.keys(obj); _i < _a.length; _i++) {
+        var key = _a[_i];
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        var value = obj[key];
+        copy[key] = createSnapshot(value);
     }
     return copy;
 }

package/build/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAAA,8DAA8D;AAC9D,SAAgB,cAAc,CAAI,GAAM;IACtC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,GAAG,CAAC;IACb,CAAC;IACD,6DAA6D;IAC7D,aAAa;IACb,IAAI,OAAO,GAAG,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;QACzC,6DAA6D;QAC7D,aAAa;QACb,OAAO,GAAG,CAAC,UAAU,EAAO,CAAC;IAC/B,CAAC;IACD,6DAA6D;IAC7D,aAAa;IACb,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QACrC,6DAA6D;QAC7D,aAAa;QACb,OAAO,GAAG,CAAC,MAAM,EAAO,CAAC;IAC3B,CAAC;IACD,IAAM,IAAI,GAAK,EAAO,CAAC;IACvB,KAAK,IAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;YACpD,SAAS;QACX,CAAC;QACD,IAAI,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YACrB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AA9BD,wCA8BC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAAA,8DAA8D;AAC9D,SAAgB,cAAc,CAAI,GAAM;IACtC,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,oCAAoC;IACpC,8DAA8D;IAC9D,IAAI,OAAQ,GAAW,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;QAClD,8DAA8D;QAC9D,OAAQ,GAAW,CAAC,UAAU,EAAE,CAAC;IACnC,CAAC;IACD,8DAA8D;IAC9D,IAAI,OAAQ,GAAW,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QAC9C,8DAA8D;QAC9D,OAAQ,GAAW,CAAC,MAAM,EAAE,CAAC;IAC/B,CAAC;IAED,WAAW;IACX,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,cAAc,CAAC,IAAI,CAAC,EAApB,CAAoB,CAAiB,CAAC;IAC/D,CAAC;IAED,aAAa;IACb,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC;IACb,CAAC;IAED,eAAe;IACf,IAAM,IAAI,GAAG,EAA6B,CAAC;IAE3C,KAAkB,UAA0B,EAA1B,KAAA,MAAM,CAAC,IAAI,CAAC,GAAa,CAAC,EAA1B,cAA0B,EAA1B,IAA0B,EAAE,CAAC;QAA1C,IAAM,GAAG,SAAA;QACZ,8DAA8D;QAC9D,IAAM,KAAK,GAAI,GAAW,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,IAAS,CAAC;AACnB,CAAC;AArCD,wCAqCC"}

package/build/index.d.ts

@@ -10,4 +10,5 @@ import { Eventable } from './mixins/Eventable';
 import { Application } from './application/Application';
 import { ApplicationModule } from './application/ApplicationModule';
 import { bootstrap } from './bootstrap';
-export { Entity, EntityId, ValueObject, AggregateRoot, HashError, DomainEvent, DomainEventSubscriber, EventBus, Eventable, Application, ApplicationModule, bootstrap };
+import { getDiff, DiffFormatterOptions, DiffViewModel } from './helpers/diff';
+export { Entity, EntityId, ValueObject, AggregateRoot, HashError, DomainEvent, DomainEventSubscriber, EventBus, Eventable, Application, ApplicationModule, bootstrap, DiffViewModel, DiffFormatterOptions, getDiff };

package/build/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bootstrap = exports.ApplicationModule = exports.Application = exports.Eventable = exports.DomainEvent = exports.HashError = exports.AggregateRoot = exports.ValueObject = exports.EntityId = exports.Entity = void 0;
+exports.getDiff = exports.bootstrap = exports.ApplicationModule = exports.Application = exports.Eventable = exports.DomainEvent = exports.HashError = exports.AggregateRoot = exports.ValueObject = exports.EntityId = exports.Entity = void 0;
 var Entity_1 = require("./Entity");
 Object.defineProperty(exports, "Entity", { enumerable: true, get: function () { return Entity_1.Entity; } });
 var EntityId_1 = require("./EntityId");
@@ -21,4 +21,6 @@ var ApplicationModule_1 = require("./application/ApplicationModule");
 Object.defineProperty(exports, "ApplicationModule", { enumerable: true, get: function () { return ApplicationModule_1.ApplicationModule; } });
 var bootstrap_1 = require("./bootstrap");
 Object.defineProperty(exports, "bootstrap", { enumerable: true, get: function () { return bootstrap_1.bootstrap; } });
+var diff_1 = require("./helpers/diff");
+Object.defineProperty(exports, "getDiff", { enumerable: true, get: function () { return diff_1.getDiff; } });
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAchC,uFAdO,eAAM,OAcP;AAbR,uCAAsC;AAcpC,yFAdO,mBAAQ,OAcP;AAbV,6CAA4C;AAc1C,4FAdO,yBAAW,OAcP;AAbb,iDAAgD;AAc9C,8FAdO,6BAAa,OAcP;AAbf,+CAA8C;AAc5C,0FAdO,qBAAS,OAcP;AAbX,6CAA4C;AAc1C,4FAdO,yBAAW,OAcP;AAXb,gDAA+C;AAc7C,0FAdO,qBAAS,OAcP;AAbX,yDAAwD;AAetD,4FAfO,yBAAW,OAeP;AAdb,qEAAoE;AAelE,kGAfO,qCAAiB,OAeP;AAdnB,yCAAwC;AAgBtC,0FAhBO,qBAAS,OAgBP"}
+{"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,uCAA8E;AAoB5E,wFApBO,cAAO,OAoBP"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pocket-architect/core",
-  "version": "0.1.23",
+  "version": "0.1.27",
   "description": "",
   "main": "build/index.js",
   "scripts": {

package/src/Entity.spec.ts

@@ -1,9 +1,19 @@
 import { Entity } from './Entity';
 import { EntityId } from './EntityId';
+import {getDiff} from "./helpers/diff";
 
 interface TestProps {
   name: string;
   testId?: EntityId<string>;
+  test2: TestEntity2;
+  parts: {
+    amount: number;
+    entity: TestEntity2;
+  }[];
+}
+interface TestProps2 {
+  name: string;
+  testId?: EntityId<string>;
 }
 class TestEntity extends Entity<TestProps, string, EntityId<string>> {
   static create(props: TestProps, id?:EntityId<string>|string): TestEntity {
@@ -17,20 +27,44 @@ class TestEntity extends Entity<TestProps, string, EntityId<string>> {
   set testId(val: EntityId<string>) {
     this.props.testId = val;
   }
+
+  setFirstAmount(amount:number):void {
+    this.props.parts[0].amount = amount;
+  }
+}
+class TestEntity2 extends Entity<TestProps2, string, EntityId<string>> {
+  static create(props: TestProps2, id?:EntityId<string>|string): TestEntity2 {
+    return new TestEntity2(props, id);
+  }
 }
 
 describe('Entity', () => {
   let entity: TestEntity;
 
   beforeAll(() => {
-    entity = TestEntity.create({ name: 'test', testId: new EntityId('1') }, '1');
+    entity = TestEntity.create({
+      name: 'test', testId: new EntityId('1'),
+      test2: TestEntity2.create({ name: 'test', testId: new EntityId('1') }),
+      parts: [{
+        amount: 1000,
+        entity: TestEntity2.create({ name: 'part entity', testId: new EntityId('2') })
+      }]
+    }, '1');
   });
 
   test('base', async () => {
-    const entityNew = TestEntity.create({ name: 'test2' });
+    const entityNew = TestEntity.create({
+      name: 'test2',
+      test2: TestEntity2.create({ name: 'test', testId: new EntityId('1') }),
+      parts: []
+    });
     expect(entityNew.id.toString().length).toEqual(36); // random id
 
-    const entity2 = TestEntity.create({ name: 'test2' }, '1');
+    const entity2 = TestEntity.create({
+      name: 'test2',
+      test2: TestEntity2.create({ name: 'test', testId: new EntityId('1') }),
+      parts: []
+    }, '1');
     expect(entity.equals(entity2)).toBeTruthy(); // same id
     expect(entity.equals(entity)).toBeTruthy(); // same instance
     expect(entity.equals(null)).toBeFalsy(); // null
@@ -38,7 +72,11 @@ describe('Entity', () => {
     expect(entity.id.toPrimitive()).toEqual('1');
     expect(entity.id.toString()).toEqual('6061cf31-edcb-5d22-9adc-927af7c186fa');
 
-    const entity3 = TestEntity.create({ name: 'test2' }, entity.id);
+    const entity3 = TestEntity.create({
+      name: 'test2',
+      test2: TestEntity2.create({ name: 'test', testId: new EntityId('1') }),
+      parts: []
+    }, entity.id);
     expect(entity.equals(entity3)).toBeTruthy(); // same id
     expect(entity3.id.toPrimitive()).toEqual('1');
     expect(entity3.id.toString()).toEqual('6061cf31-edcb-5d22-9adc-927af7c186fa');
@@ -46,15 +84,72 @@ describe('Entity', () => {
 
   test('snapshot', async () => {
     const snapshot = entity.snapshot();
-    expect(snapshot).toEqual({ name: 'test', testId: '3D4WX' });
+    expect(snapshot).toEqual({
+      "name": "test",
+      "parts": [
+        {
+          "amount": 1000,
+          "entity": {
+            "name": "part entity",
+            "testId": "QbPvX"
+          }
+        }
+      ],
+      "test2": {
+        "name": "test",
+        "testId": "3D4WX"
+      },
+      "testId": "3D4WX"
+    });
 
     expect(() => {
       snapshot.name = 'changed';
-    }).toThrow()
+    }).toThrow();
+    const beforeSnapshot = entity.snapshot();
+    const formatter = {
+      resolveLabel({ key, index, path }) {
+        if (key === 'createdAt') return null; // ignore
+
+        if (key === 'amount' && index !== null) return `Ціна (позиція ${index + 1})`;
+        if (path === 'name') return 'Імʼя';
+
+        return undefined;
+      },
+      formatValue(value, { key }) {
+        if (value instanceof EntityId) {
+          return value.toHash();
+        }
+        if (key === 'amount' && typeof value === 'number') return `${value.toFixed(2)} грн`;
+        return String(value);
+      },
+    };
+
     expect(entity.isDirty()).toEqual(false);
-    expect(entity.snapshotDiff()).toEqual(null);
+    expect(getDiff(beforeSnapshot, entity.snapshot(), formatter)).toEqual(null);
     entity.name = 'test changed';
+    entity.setFirstAmount(200);
     expect(entity.isDirty()).toEqual(true);
-    expect(entity.snapshotDiff()).toEqual({"name": "test changed"});
+    expect(getDiff(beforeSnapshot, entity.snapshot(), formatter)).toEqual([
+      {
+        "after": "test changed",
+        "afterRaw": "test changed",
+        "before": "test",
+        "beforeRaw": "test",
+        "index": null,
+        "kind": "changed",
+        "label": "Імʼя",
+        "path": "name"
+      },
+      {
+        "after": "200.00 грн",
+        "afterRaw": 200,
+        "before": "1000.00 грн",
+        "beforeRaw": 1000,
+        "index": 0,
+        "kind": "changed",
+        "label": "Ціна (позиція 1)",
+        "path": "parts[0].amount"
+      }
+    ]);
   });
 });

package/src/Entity.ts

@@ -11,27 +11,15 @@ export abstract class Entity<T, E, H extends EntityId<E>> {
   protected _snapshot: string;
 
   snapshot(): T {
-    this._snapshot = JSON.stringify(this.props);
+    // важливо: snapshot має бути стабільним (createSnapshot)
+    const snapObj = createSnapshot(this.props);
+    this._snapshot = JSON.stringify(snapObj);
+
     const copy = JSON.parse(this._snapshot) as T;
     Object.freeze(copy);
     return copy;
   }
 
-  snapshotDiff(): Partial<T> | null {
-    if (!this._snapshot) {
-      return null;
-    }
-    const diffs: Partial<T> = {};
-    const copy = JSON.parse(this._snapshot);
-    const snapshotObj = createSnapshot(this.props);
-    for (const key in this.props) {
-      if (JSON.stringify(snapshotObj[key]) !== JSON.stringify(copy[key])) {
-        diffs[key] = this.props[key];
-      }
-    }
-    return Object.keys(diffs).length > 0 ? diffs : null;
-  }
-
   isDirty(): boolean {
     if (!this._snapshot) {
       return false;

package/src/EntityId.ts

@@ -56,7 +56,7 @@ export class EntityId<T> {
   }
 
   toJSON(): string {
-    return this.toHash();
+    return this._recordId ? this.toHash() : null;
   }
 
   equals(id: EntityId<T>): boolean {

package/src/EventBus.spec.ts

@@ -3,6 +3,7 @@ import {DomainEventSubscriber} from "./DomainEventSubscriber";
 import {DomainEvent, DomainEventClass} from "./DomainEvent";
 import {EntityId} from "./EntityId";
 import {Entity} from "./Entity";
+import {DiffFormatterOptions} from "./helpers/diff";
 
 describe('EventBus', () => {
   class NewUserCreated extends DomainEvent<{ username: string }> {
@@ -57,13 +58,25 @@ describe('EventBus', () => {
       get username(): string {
         return this.props.username;
       }
+
+      toDiff(): DiffFormatterOptions | null {
+        return {
+          resolveLabel({ key }) {
+            return key;
+          },
+          formatValue(value) {
+            return value?.toString();
+          },
+        };
+      }
     }
 
-    class UserCreatedEvent extends DomainEvent<Partial<IUser>> {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    class UserCreatedEvent extends DomainEvent<{ diff: any }> {
       readonly eventName = 'UserCreatedEvent'; // без цього не буде працювати статична типізація
 
-      get username() {
-        return this.props.username;
+      get diff() {
+        return this.props.diff;
       }
     }
 
@@ -75,7 +88,9 @@ describe('EventBus', () => {
 
       // Реалізуємо логіку обробки подій
       async on(domainEvent: UserCreatedEvent) {
-        console.log('Username changed:', domainEvent.username);
+        expect(domainEvent.diff).toEqual([
+          { test: 1 }
+        ]);
       }
     }
 
@@ -91,11 +106,12 @@ describe('EventBus', () => {
     // Змінюємо ім'я користувача
     user.username = 'john_doe_updated';
     let event;
+    expect(user.isDirty()).toBeTruthy();
     // Перевіряємо, чи є зміни
     if (user.isDirty()) {
-      const diff = user.snapshotDiff();
+      const diff = [{ test: 1 }];
       if (diff) {
-        event = new UserCreatedEvent(diff);
+        event = new UserCreatedEvent({ diff });
         // записуємо подію в чергу (не publish). Бо якщо в циклі може бути багато подій і їх треба назбирати, а потім виконати, тому збираємо через push
         eventBus.push(event);
       }

package/src/helpers/diff.ts

@@ -0,0 +1,231 @@
+export type DiffKind = 'added' | 'removed' | 'changed';
+
+export type PathSegment =
+  | { type: 'key'; key: string }
+  | { type: 'index'; index: number };
+
+export interface DiffEntry {
+  path: string;
+  segments: PathSegment[];
+  kind: DiffKind;
+  before?: unknown;
+  after?: unknown;
+}
+
+export interface LabelContext {
+  key: string | null;     // назва поля (останній key)
+  index: number | null;   // індекс масиву, якщо зміна всередині масиву
+  path: string;           // items[2].price
+  segments: PathSegment[];
+  entry: DiffEntry;
+}
+
+export interface DiffFormatterOptions {
+  /**
+   * - string → label (людська назва поля)
+   * - null → ignore
+   * - undefined → fallback на path
+   */
+  resolveLabel?: (ctx: LabelContext) => string | null | undefined;
+
+  formatValue?: (value: unknown, ctx: LabelContext) => string;
+}
+
+export interface DiffViewModel {
+  kind: DiffKind;
+  label: string;
+  path: string;
+  index: number | null;
+
+  beforeRaw?: unknown;
+  afterRaw?: unknown;
+
+  before?: string;
+  after?: string;
+}
+
+export function diffObjects(before: unknown, after: unknown): DiffEntry[] {
+  const diffs: DiffEntry[] = [];
+  walk(before, after, [], diffs);
+  return diffs;
+}
+
+function walk(
+  before: unknown,
+  after: unknown,
+  segments: PathSegment[],
+  out: DiffEntry[]
+): void {
+  if (Object.is(before, after)) return;
+
+  const isPlainObject = (v: unknown) =>
+    typeof v === 'object' && v !== null && !Array.isArray(v);
+
+  // arrays
+  if (Array.isArray(before) || Array.isArray(after)) {
+    const bArr = Array.isArray(before) ? before : [];
+    const aArr = Array.isArray(after) ? after : [];
+    const max = Math.max(bArr.length, aArr.length);
+
+    for (let i = 0; i < max; i++) {
+      walk(bArr[i], aArr[i], [...segments, { type: 'index', index: i }], out);
+    }
+    return;
+  }
+
+  // primitives or mismatched types
+  if (!isPlainObject(before) || !isPlainObject(after)) {
+    out.push({
+      path: segmentsToPath(segments),
+      segments,
+      kind: 'changed',
+      before,
+      after,
+    });
+    return;
+  }
+
+  // objects
+  const bObj = before as Record<string, unknown>;
+  const aObj = after as Record<string, unknown>;
+  const keys = [...Object.keys(bObj), ...Object.keys(aObj)];
+
+  for (const key of keys) {
+    const b = bObj[key];
+    const a = aObj[key];
+    const nextSeg = [...segments, { type: 'key', key } as const];
+
+    if (b === undefined && a !== undefined) {
+      out.push({
+        path: segmentsToPath(nextSeg),
+        segments: nextSeg,
+        kind: 'added',
+        after: a,
+      });
+      continue;
+    }
+
+    if (b !== undefined && a === undefined) {
+      out.push({
+        path: segmentsToPath(nextSeg),
+        segments: nextSeg,
+        kind: 'removed',
+        before: b,
+      });
+      continue;
+    }
+
+    walk(b, a, nextSeg, out);
+  }
+}
+
+function segmentsToPath(segments: PathSegment[]): string {
+  let path = '';
+  for (const s of segments) {
+    if (s.type === 'key') {
+      path += path ? `.${s.key}` : s.key;
+    } else {
+      path += `[${s.index}]`;
+    }
+  }
+  return path || '';
+}
+
+function buildLabelContext(entry: DiffEntry): LabelContext {
+  let key: string | null = null;
+  let index: number | null = null;
+
+  for (let i = entry.segments.length - 1; i >= 0; i--) {
+    const s = entry.segments[i];
+    if (s.type === 'key') {
+      key = s.key;
+      break;
+    }
+  }
+
+  for (let i = entry.segments.length - 1; i >= 0; i--) {
+    const s = entry.segments[i];
+    if (s.type === 'index') {
+      index = s.index;
+      break;
+    }
+  }
+
+  return {
+    key,
+    index,
+    path: entry.path,
+    segments: entry.segments,
+    entry,
+  };
+}
+
+function defaultStringify(value: unknown): string {
+  if (typeof value === 'string') return `"${value}"`;
+  if (typeof value === 'boolean') return value ? 'true' : 'false';
+  if (value === null) return 'null';
+  if (typeof value === 'object') return JSON.stringify(value);
+  return String(value);
+}
+
+export function buildDiffViewModel(
+  diffs: DiffEntry[],
+  options: DiffFormatterOptions
+): DiffViewModel[] {
+  const { resolveLabel, formatValue = defaultStringify } = options;
+
+  const seen = new Set<string>();
+  const result: DiffViewModel[] = [];
+
+  for (const entry of diffs) {
+    const ctx = buildLabelContext(entry);
+
+    const resolvedLabel = resolveLabel?.(ctx);
+    if (resolvedLabel === null) continue;
+
+    const label = resolvedLabel ?? entry.path;
+
+    const beforeFormatted =
+      entry.before !== undefined ? formatValue(entry.before, ctx) : undefined;
+
+    const afterFormatted =
+      entry.after !== undefined ? formatValue(entry.after, ctx) : undefined;
+
+    // якщо форматовано однаково — не зміна
+    if (entry.kind === 'changed' && beforeFormatted === afterFormatted) {
+      continue;
+    }
+
+    // 👇 КЛЮЧ ДЕДУПЛІКАЦІЇ
+    const dedupeKey = `${entry.kind}|${entry.path}`;
+
+    if (seen.has(dedupeKey)) {
+      continue;
+    }
+    seen.add(dedupeKey);
+
+    result.push({
+      kind: entry.kind,
+      label,
+      path: entry.path,
+      index: ctx.index,
+      beforeRaw: entry.before,
+      afterRaw: entry.after,
+      before: beforeFormatted,
+      after: afterFormatted,
+    });
+  }
+
+  return result;
+}
+
+/**
+ * Повертає diff у вигляді масиву обʼєктів (DiffViewModel),
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function getDiff(beforeObj: any, afterObj: any, diffOptions: DiffFormatterOptions): DiffViewModel[] | null {
+  const diffs = diffObjects(beforeObj, afterObj);
+  if (diffs.length === 0) return null;
+
+  return buildDiffViewModel(diffs, diffOptions);
+}

package/src/helpers.ts

@@ -1,32 +1,39 @@
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function createSnapshot<T>(obj: T): T {
-  if (!obj) {
+  if (obj === null || obj === undefined) {
     return obj;
   }
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  if (typeof obj.toSnapshot === 'function') {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    return obj.toSnapshot() as T;
+
+  // toSnapshot має найвищий пріоритет
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  if (typeof (obj as any).toSnapshot === 'function') {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (obj as any).toSnapshot();
   }
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  if (typeof obj.toJSON === 'function') {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    return obj.toJSON() as T;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  if (typeof (obj as any).toJSON === 'function') {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (obj as any).toJSON();
   }
-  const copy:T = {} as T;
-  for (const key in obj) {
-    if (!Object.prototype.hasOwnProperty.call(obj, key)) {
-      continue;
-    }
-    if (typeof obj[key] !== 'object') {
-      copy[key] = obj[key];
-      continue;
-    }
-    copy[key] = createSnapshot(obj[key]);
+
+  // ✅ МАСИВИ
+  if (Array.isArray(obj)) {
+    return obj.map(item => createSnapshot(item)) as unknown as T;
   }
-  return copy;
+
+  // primitives
+  if (typeof obj !== 'object') {
+    return obj;
+  }
+
+  // plain object
+  const copy = {} as Record<string, unknown>;
+
+  for (const key of Object.keys(obj as object)) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const value = (obj as any)[key];
+    copy[key] = createSnapshot(value);
+  }
+
+  return copy as T;
 }

package/src/index.ts

@@ -10,6 +10,7 @@ import { Eventable } from './mixins/Eventable';
 import { Application } from './application/Application';
 import { ApplicationModule } from './application/ApplicationModule';
 import { bootstrap } from './bootstrap';
+import { getDiff, DiffFormatterOptions, DiffViewModel } from './helpers/diff';
 
 export {
   Entity,
@@ -25,5 +26,9 @@ export {
   Application,
   ApplicationModule,
 
-  bootstrap
+  bootstrap,
+
+  DiffViewModel,
+  DiffFormatterOptions,
+  getDiff
 }