@pocket-architect/core 0.1.5 → 0.1.7

package/build/AggregateRoot.d.ts

@@ -1,3 +1,4 @@
 import { Entity } from './Entity';
-export declare abstract class AggregateRoot<T> extends Entity<T> {
+import { EntityId } from './EntityId';
+export declare abstract class AggregateRoot<T, H extends EntityId> extends Entity<T, H> {
 }

package/build/AggregateRoot.js.map

@@ -1 +1 @@
-{"version":3,"file":"AggregateRoot.js","sourceRoot":"","sources":["../src/AggregateRoot.ts"],"names":[],"mappings":";;;;AAAA,mCAAkC;AAElC;IAA+C,yCAAS;IAAxD;;IAEA,CAAC;IAAD,oBAAC;AAAD,CAAC,AAFD,CAA+C,eAAM,GAEpD;AAFqB,sCAAa"}
+{"version":3,"file":"AggregateRoot.js","sourceRoot":"","sources":["../src/AggregateRoot.ts"],"names":[],"mappings":";;;;AAAA,mCAAkC;AAGlC;IAAmE,yCAAY;IAA/E;;IAEA,CAAC;IAAD,oBAAC;AAAD,CAAC,AAFD,CAAmE,eAAM,GAExE;AAFqB,sCAAa"}

package/build/Entity.d.ts

@@ -1,8 +1,10 @@
-export type EntityId = string;
-export declare abstract class Entity<T> {
-    protected readonly _id: EntityId;
+import { EntityId } from './EntityId';
+export declare abstract class Entity<T, H extends EntityId> {
+    protected readonly _id: H;
     protected props: T;
-    protected constructor(props: T, id?: EntityId);
-    equals(object?: Entity<T>): boolean;
-    get id(): EntityId;
+    protected constructor(props: T, id?: H | string | number);
+    equals(object?: Entity<T, H>): boolean;
+    get id(): H;
+    toPrimitive(): T;
+    toJSON(): T;
 }

package/build/Entity.js

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Entity = void 0;
-var tslib_1 = require("tslib");
-var uuid_by_string_1 = tslib_1.__importDefault(require("uuid-by-string"));
-var cuid2_1 = require("@paralleldrive/cuid2");
+var EntityId_1 = require("./EntityId");
 var isEntity = function (v) {
     return v instanceof Entity;
 };
 var Entity = /** @class */ (function () {
     function Entity(props, id) {
-        this._id = id ? id : (0, uuid_by_string_1.default)((0, cuid2_1.createId)(), (0, uuid_by_string_1.default)(this.constructor.name));
+        if (id) {
+            this._id = (typeof id === 'object' ? id : new EntityId_1.EntityId(id));
+        }
+        else {
+            this._id = (new EntityId_1.EntityId());
+        }
         this.props = props;
     }
     Entity.prototype.equals = function (object) {
@@ -22,7 +25,7 @@ var Entity = /** @class */ (function () {
         if (!isEntity(object)) {
             return false;
         }
-        return this._id == object._id;
+        return this._id.equals(object._id);
     };
     Object.defineProperty(Entity.prototype, "id", {
         get: function () {
@@ -31,6 +34,12 @@ var Entity = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Entity.prototype.toPrimitive = function () {
+        return this.props;
+    };
+    Entity.prototype.toJSON = function () {
+        return this.toPrimitive();
+    };
     return Entity;
 }());
 exports.Entity = Entity;

package/build/Entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../src/Entity.ts"],"names":[],"mappings":";;;;AAAA,0EAAuC;AACvC,8CAA+C;AAE/C,IAAM,QAAQ,GAAG,UAAI,CAAY;IAC/B,OAAO,CAAC,YAAY,MAAM,CAAA;AAC5B,CAAC,CAAA;AAID;IAIE,gBAAsB,KAAQ,EAAE,EAAa;QAC3C,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAA,wBAAU,EAAC,IAAA,gBAAQ,GAAE,EAAE,IAAA,wBAAU,EAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/E,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;IAEM,uBAAM,GAAb,UAAc,MAAkB;QAC9B,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,IAAI,MAAM,CAAC,GAAG,CAAA;IAC/B,CAAC;IAED,sBAAI,sBAAE;aAAN;YACE,OAAO,IAAI,CAAC,GAAG,CAAA;QACjB,CAAC;;;OAAA;IACH,aAAC;AAAD,CAAC,AA5BD,IA4BC;AA5BqB,wBAAM"}
+{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../src/Entity.ts"],"names":[],"mappings":";;;AAAA,uCAAsC;AAEtC,IAAM,QAAQ,GAAG,UAAwB,CAAe;IACtD,OAAO,CAAC,YAAY,MAAM,CAAA;AAC5B,CAAC,CAAA;AAED;IAIE,gBAAsB,KAAQ,EAAE,EAAoB;QAClD,IAAI,EAAE,EAAE,CAAC;YACP,IAAI,CAAC,GAAG,GAAM,CAAC,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,mBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;QACjE,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;IAEM,uBAAM,GAAb,UAAc,MAAqB;QACjC,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,uBAAM,GAAN;QACE,OAAO,IAAI,CAAC,WAAW,EAAE,CAAA;IAC3B,CAAC;IACH,aAAC;AAAD,CAAC,AAxCD,IAwCC;AAxCqB,wBAAM"}

package/build/Entity.spec.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var Entity_1 = require("./Entity");
+var EntityId_1 = require("./EntityId");
 var TestEntity = /** @class */ (function (_super) {
     tslib_1.__extends(TestEntity, _super);
     function TestEntity() {
@@ -15,19 +16,24 @@ var TestEntity = /** @class */ (function (_super) {
 describe('Entity', function () {
     var entity;
     beforeAll(function () {
-        entity = TestEntity.create({ name: 'test' }, '1');
+        entity = TestEntity.create({ name: 'test' }, 1);
     });
     test('base', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var entityNew, entity2;
+        var entityNew, entity2, entity3;
         return tslib_1.__generator(this, function (_a) {
             entityNew = TestEntity.create({ name: 'test2' });
-            expect(entityNew.id.length).toEqual(36); // random id
-            entity2 = TestEntity.create({ name: 'test2' }, '1');
+            expect(entityNew.id.toString().length).toEqual(36); // random id
+            entity2 = TestEntity.create({ name: 'test2' }, 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: '1' })).toBeFalsy(); // not Entity
-            expect(entity.id).toEqual('1');
+            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);
+            expect(entity.equals(entity3)).toBeTruthy(); // same id
+            expect(entity3.id.toPrimitive()).toEqual('1');
+            expect(entity3.id.toString()).toEqual('6061cf31-edcb-5d22-9adc-927af7c186fa');
             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":";;;AAAA,mCAAkC;AAKlC;IAAyB,sCAAiB;IAA1C;;IAIA,CAAC;IAHQ,iBAAM,GAAb,UAAc,KAAgB,EAAE,EAAU;QACxC,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnC,CAAC;IACH,iBAAC;AAAD,CAAC,AAJD,CAAyB,eAAM,GAI9B;AAED,QAAQ,CAAC,QAAQ,EAAE;IACjB,IAAI,MAAkB,CAAC;IAEvB,SAAS,CAAC;QACR,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE;;;YACL,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YACvD,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY;YAE/C,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,CAAC,CAAC;YAC1D,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,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,aAAa;YACzE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;;;SAChC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"Entity.spec.js","sourceRoot":"","sources":["../src/Entity.spec.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAClC,uCAAsC;AAKtC;IAAyB,sCAA2B;IAApD;;IAIA,CAAC;IAHQ,iBAAM,GAAb,UAAc,KAAgB,EAAE,EAA0B;QACxD,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnC,CAAC;IACH,iBAAC;AAAD,CAAC,AAJD,CAAyB,eAAM,GAI9B;AAED,QAAQ,CAAC,QAAQ,EAAE;IACjB,IAAI,MAAkB,CAAC;IAEvB,SAAS,CAAC;QACR,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE;;;YACL,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YACvD,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,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YACxD,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,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,aAAa;YACrF,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,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YAChE,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;AACL,CAAC,CAAC,CAAC"}

package/build/EntityId.d.ts

@@ -0,0 +1,8 @@
+export declare class EntityId {
+    protected _recordId: string;
+    protected _uuid: string;
+    constructor(recordId?: string | number, uuid?: string);
+    toPrimitive(): string;
+    toString(): string;
+    equals(id: EntityId): boolean;
+}

package/build/EntityId.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EntityId = void 0;
+var tslib_1 = require("tslib");
+var uuid_by_string_1 = tslib_1.__importDefault(require("uuid-by-string"));
+var cuid2_1 = require("@paralleldrive/cuid2");
+var EntityId = /** @class */ (function () {
+    function EntityId(recordId, uuid) {
+        if (recordId === void 0) { recordId = null; }
+        if (uuid === void 0) { uuid = null; }
+        this._recordId = null;
+        this._uuid = null;
+        this._recordId = recordId ? recordId.toString() : (0, cuid2_1.createId)();
+        if (!uuid) {
+            this._uuid = (0, uuid_by_string_1.default)(recordId ? recordId.toString() : (0, cuid2_1.createId)(), (0, uuid_by_string_1.default)(this.constructor.name));
+        }
+    }
+    EntityId.prototype.toPrimitive = function () {
+        return this._recordId;
+    };
+    EntityId.prototype.toString = function () {
+        return this._uuid;
+    };
+    EntityId.prototype.equals = function (id) {
+        return this._uuid === id._uuid;
+    };
+    return EntityId;
+}());
+exports.EntityId = EntityId;
+//# sourceMappingURL=EntityId.js.map

package/build/EntityId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityId.js","sourceRoot":"","sources":["../src/EntityId.ts"],"names":[],"mappings":";;;;AAAA,0EAAuC;AACvC,8CAA+C;AAE/C;IAIE,kBAAY,QAA8B,EAAE,IAAmB;QAAnD,yBAAA,EAAA,eAA8B;QAAE,qBAAA,EAAA,WAAmB;QAHrD,cAAS,GAAW,IAAI,CAAC;QACzB,UAAK,GAAW,IAAI,CAAC;QAG7B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAA,gBAAQ,GAAE,CAAC;QAC7D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,KAAK,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAA,gBAAQ,GAAE,EAAE,IAAA,wBAAU,EAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1G,CAAC;IACH,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,UAAO,EAAY;QACjB,OAAO,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC,KAAK,CAAC;IACjC,CAAC;IACH,eAAC;AAAD,CAAC,AAtBD,IAsBC;AAtBY,4BAAQ"}

package/build/index.d.ts

@@ -1,4 +1,5 @@
-import { Entity, EntityId } from './Entity';
+import { Entity } from './Entity';
+import { EntityId } from './EntityId';
 import { ValueObject } from './ValueObject';
 import { AggregateRoot } from './AggregateRoot';
 export { Entity, EntityId, ValueObject, AggregateRoot };

package/build/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AggregateRoot = exports.ValueObject = exports.Entity = void 0;
+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");
+Object.defineProperty(exports, "EntityId", { enumerable: true, get: function () { return EntityId_1.EntityId; } });
 var ValueObject_1 = require("./ValueObject");
 Object.defineProperty(exports, "ValueObject", { enumerable: true, get: function () { return ValueObject_1.ValueObject; } });
 var AggregateRoot_1 = require("./AggregateRoot");

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;AAK1C,uFALO,eAAM,OAKP;AAJR,6CAA4C;AAM1C,4FANO,yBAAW,OAMP;AALb,iDAAgD;AAM9C,8FANO,6BAAa,OAMP"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAMhC,uFANO,eAAM,OAMP;AALR,uCAAsC;AAMpC,yFANO,mBAAQ,OAMP;AALV,6CAA4C;AAM1C,4FANO,yBAAW,OAMP;AALb,iDAAgD;AAM9C,8FANO,6BAAa,OAMP"}

package/build/mixins/Eventable.d.ts

@@ -0,0 +1,15 @@
+export interface IEventable<TEvent> {
+    registerEvent(handler: Event<TEvent>): void;
+    releaseEvents(): Event<TEvent>[];
+}
+export declare class Event<TEvent> {
+    payload: TEvent;
+    constructor(payload: TEvent);
+}
+export declare function Eventable<TEvent>(): <TBase extends new (...args: any[]) => {}>(Base: TBase) => {
+    new (...args: any[]): {
+        _events: Event<TEvent>[];
+        registerEvent(handler: Event<TEvent>): void;
+        releaseEvents(): Event<TEvent>[];
+    };
+} & TBase;

package/build/mixins/Eventable.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Eventable = exports.Event = void 0;
+var tslib_1 = require("tslib");
+var Event = /** @class */ (function () {
+    function Event(payload) {
+        this.payload = payload;
+    }
+    return Event;
+}());
+exports.Event = Event;
+function Eventable() {
+    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any
+    return function (Base) {
+        return /** @class */ (function (_super) {
+            tslib_1.__extends(class_1, _super);
+            function class_1() {
+                var _this = _super !== null && _super.apply(this, arguments) || this;
+                _this._events = [];
+                return _this;
+            }
+            class_1.prototype.registerEvent = function (handler) {
+                this._events.push(handler);
+            };
+            class_1.prototype.releaseEvents = function () {
+                var list = this._events;
+                this._events = [];
+                return list;
+            };
+            return class_1;
+        }(Base));
+    };
+}
+exports.Eventable = Eventable;
+//# sourceMappingURL=Eventable.js.map

package/build/mixins/Eventable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Eventable.js","sourceRoot":"","sources":["../../src/mixins/Eventable.ts"],"names":[],"mappings":";;;;AAIA;IACE,eAAmB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;IACxC,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIlB,SACS,SAAS;IAChB,8IAA8I;IAC9I,OAAO,UAAoD,IAAW;QACpE;YAAqB,mCAAI;YAAlB;;gBACL,aAAO,GAAoB,EAAE,CAAC;;YAWhC,CAAC;YATC,+BAAa,GAAb,UAAc,OAAsB;gBAClC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7B,CAAC;YAED,+BAAa,GAAb;gBACE,IAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC1B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;gBAClB,OAAO,IAAI,CAAC;YACd,CAAC;YACH,cAAC;QAAD,CAAC,AAZM,CAAc,IAAI,GAYvB;IACJ,CAAC,CAAC;AACJ,CAAC;AAlBD,8BAkBC"}

package/build/mixins/Eventable.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/build/mixins/Eventable.spec.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var Eventable_1 = require("./Eventable");
+var MyDomainEntity = /** @class */ (function () {
+    function MyDomainEntity() {
+    }
+    return MyDomainEntity;
+}());
+var EventableMyDomainEntity = (0, Eventable_1.Eventable)()(MyDomainEntity);
+describe('Eventable', function () {
+    var entity;
+    beforeAll(function () {
+        entity = new EventableMyDomainEntity();
+    });
+    test('base', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var event;
+        return tslib_1.__generator(this, function (_a) {
+            event = new Eventable_1.Event({ message: 'hello' });
+            entity.registerEvent(event);
+            expect(entity.releaseEvents()).toEqual([event]);
+            expect(entity.releaseEvents()).toEqual([]);
+            return [2 /*return*/];
+        });
+    }); });
+});
+//# sourceMappingURL=Eventable.spec.js.map

package/build/mixins/Eventable.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Eventable.spec.js","sourceRoot":"","sources":["../../src/mixins/Eventable.spec.ts"],"names":[],"mappings":";;;AAAA,yCAA+C;AAM/C;IAAA;IACA,CAAC;IAAD,qBAAC;AAAD,CAAC,AADD,IACC;AACD,IAAM,uBAAuB,GAAG,IAAA,qBAAS,GAAkB,CAAC,cAAc,CAAC,CAAC;AAE5E,QAAQ,CAAC,WAAW,EAAE;IACpB,IAAI,MAAoD,CAAC;IAEzD,SAAS,CAAC;QACR,MAAM,GAAG,IAAI,uBAAuB,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE;;;YACL,KAAK,GAAG,IAAI,iBAAK,CAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9D,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAE5B,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAChD,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;;;SAC5C,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/package.json

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

package/src/AggregateRoot.ts

@@ -1,5 +1,6 @@
 import { Entity } from './Entity';
+import { EntityId } from './EntityId';
 
-export abstract class AggregateRoot<T> extends Entity<T> {
+export abstract class AggregateRoot<T, H extends EntityId> extends Entity<T, H> {
 
 }

package/src/Entity.spec.ts

@@ -1,10 +1,11 @@
 import { Entity } from './Entity';
+import { EntityId } from './EntityId';
 
 interface TestProps {
   name: string;
 }
-class TestEntity extends Entity<TestProps> {
-  static create(props: TestProps, id?:string): TestEntity {
+class TestEntity extends Entity<TestProps, EntityId> {
+  static create(props: TestProps, id?:EntityId|string|number): TestEntity {
     return new TestEntity(props, id);
   }
 }
@@ -13,18 +14,24 @@ describe('Entity', () => {
   let entity: TestEntity;
 
   beforeAll(() => {
-    entity = TestEntity.create({ name: 'test' }, '1');
+    entity = TestEntity.create({ name: 'test' }, 1);
   });
 
   test('base', async () => {
     const entityNew = TestEntity.create({ name: 'test2' });
-    expect(entityNew.id.length).toEqual(36); // random id
+    expect(entityNew.id.toString().length).toEqual(36); // random id
 
-    const entity2 = TestEntity.create({ name: 'test2' }, '1');
+    const entity2 = TestEntity.create({ name: 'test2' }, 1);
     expect(entity.equals(entity2)).toBeTruthy(); // same id
     expect(entity.equals(entity)).toBeTruthy(); // same instance
     expect(entity.equals(null)).toBeFalsy(); // null
-    expect(entity.equals(<TestEntity>{ id: '1' })).toBeFalsy(); // not Entity
-    expect(entity.id).toEqual('1');
+    expect(entity.equals(<TestEntity>{ id: new EntityId(1) })).toBeFalsy(); // not 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);
+    expect(entity.equals(entity3)).toBeTruthy(); // same id
+    expect(entity3.id.toPrimitive()).toEqual('1');
+    expect(entity3.id.toString()).toEqual('6061cf31-edcb-5d22-9adc-927af7c186fa');
   });
 });

package/src/Entity.ts

@@ -1,22 +1,23 @@
-import createUUID from 'uuid-by-string'
-import { createId } from '@paralleldrive/cuid2'
+import { EntityId } from './EntityId';
 
-const isEntity = <T>(v: Entity<T>): v is Entity<T> => {
+const isEntity = <T, H extends EntityId>(v: Entity<T, H>): v is Entity<T, H> => {
   return v instanceof Entity
 }
 
-export type EntityId = string;
+export abstract class Entity<T, H extends EntityId> {
+  protected readonly _id: H;
+  protected props: T;
 
-export abstract class Entity<T> {
-  protected readonly _id: EntityId;
-  protected props: T
-
-  protected constructor(props: T, id?: EntityId) {
-    this._id = id ? id : createUUID(createId(), createUUID(this.constructor.name));
+  protected constructor(props: T, id?: H|string|number) {
+    if (id) {
+      this._id = <H>(typeof id === 'object' ? id : new EntityId(id));
+    } else {
+      this._id = <H>(new EntityId());
+    }
     this.props = props
   }
 
-  public equals(object?: Entity<T>): boolean {
+  public equals(object?: Entity<T, H>): boolean {
     if (object === null || object === undefined) {
       return false
     }
@@ -29,10 +30,18 @@ export abstract class Entity<T> {
       return false
     }
 
-    return this._id == object._id
+    return this._id.equals(object._id);
   }
 
-  get id(): EntityId {
+  get id(): H {
     return this._id
   }
+
+  toPrimitive(): T {
+    return this.props
+  }
+
+  toJSON(): T {
+    return this.toPrimitive()
+  }
 }

package/src/EntityId.ts

@@ -0,0 +1,26 @@
+import createUUID from 'uuid-by-string'
+import { createId } from '@paralleldrive/cuid2'
+
+export class EntityId {
+  protected _recordId: string = null;
+  protected _uuid: string = null;
+
+  constructor(recordId: string|number = null, uuid: string = null) {
+    this._recordId = recordId ? recordId.toString() : createId();
+    if (!uuid) {
+      this._uuid = createUUID(recordId ? recordId.toString() : createId(), createUUID(this.constructor.name));
+    }
+  }
+
+  toPrimitive(): string {
+    return this._recordId;
+  }
+
+  toString(): string {
+    return this._uuid;
+  }
+
+  equals(id: EntityId): boolean {
+    return this._uuid === id._uuid;
+  }
+}

package/src/index.ts

@@ -1,4 +1,5 @@
-import { Entity, EntityId } from './Entity';
+import { Entity } from './Entity';
+import { EntityId } from './EntityId';
 import { ValueObject } from './ValueObject';
 import { AggregateRoot } from './AggregateRoot';
 

package/src/mixins/Eventable.spec.ts

@@ -0,0 +1,25 @@
+import { Event, Eventable } from './Eventable';
+
+interface MyEventPayload {
+  message: string;
+}
+
+class MyDomainEntity {
+}
+const EventableMyDomainEntity = Eventable<MyEventPayload>()(MyDomainEntity);
+
+describe('Eventable', () => {
+  let entity: InstanceType<typeof EventableMyDomainEntity>;
+
+  beforeAll(() => {
+    entity = new EventableMyDomainEntity();
+  });
+
+  test('base', async () => {
+    const event = new Event<MyEventPayload>({ message: 'hello' });
+    entity.registerEvent(event);
+
+    expect(entity.releaseEvents()).toEqual([event]);
+    expect(entity.releaseEvents()).toEqual([]);
+  });
+});

package/src/mixins/Eventable.ts

@@ -0,0 +1,27 @@
+export interface IEventable<TEvent> {
+  registerEvent(handler: Event<TEvent>): void;
+  releaseEvents():Event<TEvent>[];
+}
+export class Event<TEvent> {
+  constructor(public payload: TEvent) {}
+}
+
+export
+function Eventable<TEvent>() {
+  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any
+  return function <TBase extends new (...args: any[]) => {}>(Base: TBase) {
+    return class extends Base implements IEventable<TEvent> {
+      _events: Event<TEvent>[] = [];
+
+      registerEvent(handler: Event<TEvent>):void {
+        this._events.push(handler);
+      }
+
+      releaseEvents(): Event<TEvent>[] {
+        const list = this._events;
+        this._events = [];
+        return list;
+      }
+    };
+  };
+}