@meticoeus/ddd-es 0.2.2 → 0.2.3
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/dist/package.json +1 -1
- package/dist/src/Repository.d.ts +13 -2
- package/dist/src/Repository.d.ts.map +1 -1
- package/dist/src/Repository.js +21 -5
- package/dist/src/Repository.js.map +1 -1
- package/dist/src/Repository.mocks.d.ts +2 -2
- package/dist/src/Repository.mocks.d.ts.map +1 -1
- package/dist/src/Repository.mocks.js +2 -2
- package/dist/src/Repository.mocks.js.map +1 -1
- package/dist/src/Repository.test.js +14 -0
- package/dist/src/Repository.test.js.map +1 -1
- package/package.json +1 -1
package/dist/package.json
CHANGED
package/dist/src/Repository.d.ts
CHANGED
|
@@ -2,11 +2,22 @@ import { AggregateConfig, AggregateRoot, AggregateRootClass, PersistedAggregate
|
|
|
2
2
|
import { IRepository } from './IRepository.js';
|
|
3
3
|
import { VersionedFixedLink } from './entities.js';
|
|
4
4
|
import { ConcurrencyException, EventConflictException, EventRevision, Exception, IEvent, IEventStore, Result, SaveEventSuccess } from './types.js';
|
|
5
|
+
export interface RepositoryConfig<DomainEvent extends IEvent, T extends AggregateRoot<DomainEvent>> extends AggregateConfig {
|
|
6
|
+
/**
|
|
7
|
+
* Optional pluggable cache implementation.
|
|
8
|
+
* Using a TTL or LRU cache is recommended.
|
|
9
|
+
* Must be compatible with Map.get, Map.set.
|
|
10
|
+
*
|
|
11
|
+
* If this is not set, no caching will be used.
|
|
12
|
+
* */
|
|
13
|
+
cache?: Pick<Map<string, T>, 'get' | 'set'>;
|
|
14
|
+
}
|
|
5
15
|
export declare abstract class Repository<DomainEvent extends IEvent, T extends AggregateRoot<DomainEvent>> implements IRepository<DomainEvent, T> {
|
|
6
16
|
protected readonly _class: AggregateRootClass<DomainEvent, T>;
|
|
7
17
|
protected readonly _storage: IEventStore;
|
|
8
|
-
protected readonly
|
|
9
|
-
protected
|
|
18
|
+
protected readonly _cache?: Pick<Map<string, T>, 'get' | 'set'>;
|
|
19
|
+
protected readonly _config?: AggregateConfig;
|
|
20
|
+
protected constructor(_class: AggregateRootClass<DomainEvent, T>, _storage: IEventStore, config?: RepositoryConfig<DomainEvent, T>);
|
|
10
21
|
save(aggregate: T, expectedRevision: EventRevision): Promise<Result<SaveEventSuccess, ConcurrencyException | EventConflictException | Exception>>;
|
|
11
22
|
/**
|
|
12
23
|
* Automatically retry to save the events if none of the new events conflict with the change set
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Repository.d.ts","sourceRoot":"","sources":["../../src/Repository.ts"],"names":[],"mappings":"AAwBA,OAAO,EACL,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,EACL,oBAAoB,EAEpB,sBAAsB,EAEtB,aAAa,EACb,SAAS,EACT,MAAM,EACN,WAAW,EAEX,MAAM,EACN,gBAAgB,EACjB,MAAM,YAAY,CAAA;AAEnB,8BAAsB,UAAU,CAAC,WAAW,SAAS,MAAM,EAAE,CAAC,SAAS,aAAa,CAAC,WAAW,CAAC,CAC/F,YAAW,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Repository.d.ts","sourceRoot":"","sources":["../../src/Repository.ts"],"names":[],"mappings":"AAwBA,OAAO,EACL,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,EACL,oBAAoB,EAEpB,sBAAsB,EAEtB,aAAa,EACb,SAAS,EACT,MAAM,EACN,WAAW,EAEX,MAAM,EACN,gBAAgB,EACjB,MAAM,YAAY,CAAA;AAEnB,MAAM,WAAW,gBAAgB,CAAC,WAAW,SAAS,MAAM,EAAE,CAAC,SAAS,aAAa,CAAC,WAAW,CAAC,CAChG,SAAQ,eAAe;IACvB;;;;;;SAMK;IACL,KAAK,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,CAAA;CAC5C;AAED,8BAAsB,UAAU,CAAC,WAAW,SAAS,MAAM,EAAE,CAAC,SAAS,aAAa,CAAC,WAAW,CAAC,CAC/F,YAAW,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IAMpC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC,WAAW,EAAE,CAAC,CAAC;IAC7D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,WAAW;IAL1C,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,CAAA;IAC/D,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAA;IAE5C,SAAS,aACY,MAAM,EAAE,kBAAkB,CAAC,WAAW,EAAE,CAAC,CAAC,EAC1C,QAAQ,EAAE,WAAW,EACxC,MAAM,CAAC,EAAE,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC;IAgB9B,IAAI,CACf,SAAS,EAAE,CAAC,EACZ,gBAAgB,EAAE,aAAa,GAC9B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,oBAAoB,GAAG,sBAAsB,GAAG,SAAS,CAAC,CAAC;IAyC/F;;OAEG;cACa,SAAS,CACvB,SAAS,EAAE,CAAC,EACZ,oBAAoB,EAAE,MAAM,EAC5B,OAAO,SAAI,EACX,YAAY,CAAC,EAAE,CAAC,GACf,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,oBAAoB,GAAG,sBAAsB,GAAG,SAAS,CAAC,CAAC;IAqDxF,OAAO,CACZ,EAAE,EAAE,MAAM,EACV,cAAc,GAAE,OAAe,GAC9B,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAInD,eAAe,CACpB,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EAChB,cAAc,GAAE,OAAe,GAC9B,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAInD,SAAS,CAAC,EAAE,SAAS,MAAM,EAChC,IAAI,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAC5B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;cAQ1C,aAAa,CAC3B,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,OAAO,GAAG,SAAS,GAClC,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;CAW3D"}
|
package/dist/src/Repository.js
CHANGED
|
@@ -26,11 +26,24 @@ import { Err, EventConflictException, EventExistenceRevision, Ok, } from './type
|
|
|
26
26
|
export class Repository {
|
|
27
27
|
_class;
|
|
28
28
|
_storage;
|
|
29
|
+
_cache;
|
|
29
30
|
_config;
|
|
30
|
-
constructor(_class, _storage,
|
|
31
|
+
constructor(_class, _storage, config) {
|
|
31
32
|
this._class = _class;
|
|
32
33
|
this._storage = _storage;
|
|
33
|
-
|
|
34
|
+
if (config) {
|
|
35
|
+
const total = Object.keys(config).length;
|
|
36
|
+
if (config?.cache) {
|
|
37
|
+
this._cache = config.cache;
|
|
38
|
+
if (total > 1) {
|
|
39
|
+
const { cache, ...rest } = config;
|
|
40
|
+
this._config = rest;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
this._config = config;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
34
47
|
}
|
|
35
48
|
async save(aggregate, expectedRevision) {
|
|
36
49
|
// don't bother trying to save the first time if the expectedRevision is already out of date
|
|
@@ -43,6 +56,7 @@ export class Repository {
|
|
|
43
56
|
const res = await this._storage.saveEvents(stream, aggregate.getUncommittedChanges(), expectedRevision);
|
|
44
57
|
if (res.ok) {
|
|
45
58
|
aggregate.markChangesAsCommitted();
|
|
59
|
+
this._cache?.set(aggregate.id, aggregate);
|
|
46
60
|
return Ok({ nextExpectedRevision: res.value.nextExpectedRevision });
|
|
47
61
|
}
|
|
48
62
|
else if (res.error) {
|
|
@@ -90,6 +104,7 @@ export class Repository {
|
|
|
90
104
|
const res = await this._storage.saveEvents(streamName, aggregate.getUncommittedChanges(), nextExpectedRevision);
|
|
91
105
|
if (res.ok) {
|
|
92
106
|
aggregate.markChangesAsCommitted();
|
|
107
|
+
this._cache?.set(aggregate.id, aggregate);
|
|
93
108
|
return Ok({ nextExpectedRevision: res.value.nextExpectedRevision });
|
|
94
109
|
}
|
|
95
110
|
else if (res.error && retries > 0) {
|
|
@@ -98,13 +113,13 @@ export class Repository {
|
|
|
98
113
|
}
|
|
99
114
|
return Err(res.error);
|
|
100
115
|
}
|
|
101
|
-
|
|
116
|
+
getById(id, includeDeleted = false) {
|
|
102
117
|
return this.loadAggregate(id, undefined, includeDeleted);
|
|
103
118
|
}
|
|
104
|
-
|
|
119
|
+
getRevisionById(id, revision, includeDeleted = false) {
|
|
105
120
|
return this.loadAggregate(id, revision, includeDeleted);
|
|
106
121
|
}
|
|
107
|
-
|
|
122
|
+
getByLink(link, includeDeleted) {
|
|
108
123
|
if (link.revision === 'latest') {
|
|
109
124
|
return this.loadAggregate(link.id, undefined, includeDeleted);
|
|
110
125
|
}
|
|
@@ -121,6 +136,7 @@ export class Repository {
|
|
|
121
136
|
obj.loadFromHistory(e);
|
|
122
137
|
if (!includeDeleted && obj.deleted)
|
|
123
138
|
return undefined;
|
|
139
|
+
this._cache?.set(obj.id, obj);
|
|
124
140
|
return obj;
|
|
125
141
|
}
|
|
126
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Repository.js","sourceRoot":"","sources":["../../src/Repository.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;EAsBE;AAUF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAEL,GAAG,EACH,sBAAsB,EACtB,sBAAsB,EAKtB,EAAE,GAGH,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"Repository.js","sourceRoot":"","sources":["../../src/Repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AggregateRoot, AggregateRootClass } from './AggregateRoot.js';
|
|
2
2
|
import { Test, TestEvent } from './AggregateRoot.mocks.js';
|
|
3
|
-
import { Repository } from './Repository.js';
|
|
3
|
+
import { Repository, RepositoryConfig } from './Repository.js';
|
|
4
4
|
import { IEvent, IEventStore } from './types.js';
|
|
5
5
|
export declare class MockRepository<DomainEvent extends IEvent, T extends AggregateRoot<DomainEvent>> extends Repository<DomainEvent, T> {
|
|
6
6
|
private readonly prefixLength;
|
|
@@ -8,6 +8,6 @@ export declare class MockRepository<DomainEvent extends IEvent, T extends Aggreg
|
|
|
8
8
|
getAllIds(): string[];
|
|
9
9
|
}
|
|
10
10
|
export declare class TestRepository extends Repository<TestEvent, Test> {
|
|
11
|
-
constructor(storage: IEventStore);
|
|
11
|
+
constructor(storage: IEventStore, config?: RepositoryConfig<TestEvent, Test>);
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=Repository.mocks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Repository.mocks.d.ts","sourceRoot":"","sources":["../../src/Repository.mocks.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"Repository.mocks.d.ts","sourceRoot":"","sources":["../../src/Repository.mocks.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAGhD,qBAAa,cAAc,CACzB,WAAW,SAAS,MAAM,EAC1B,CAAC,SAAS,aAAa,CAAC,WAAW,CAAC,CACpC,SAAQ,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;gBAGnC,gBAAgB,EAAE,kBAAkB,CAAC,WAAW,EAAE,CAAC,CAAC,EACpD,UAAU,GAAE,KAAK,CAAC,MAAM,CAAM;IAkBhC,SAAS,IAAI,MAAM,EAAE;CAItB;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC;gBACjD,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC;CAG7E"}
|
|
@@ -48,8 +48,8 @@ export class MockRepository extends Repository {
|
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
export class TestRepository extends Repository {
|
|
51
|
-
constructor(storage) {
|
|
52
|
-
super(Test, storage);
|
|
51
|
+
constructor(storage, config) {
|
|
52
|
+
super(Test, storage, config);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
//# sourceMappingURL=Repository.mocks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Repository.mocks.js","sourceRoot":"","sources":["../../src/Repository.mocks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;EAsBE;AAGF,OAAO,EAAE,IAAI,EAAa,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"Repository.mocks.js","sourceRoot":"","sources":["../../src/Repository.mocks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;EAsBE;AAGF,OAAO,EAAE,IAAI,EAAa,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAoB,MAAM,iBAAiB,CAAA;AAE9D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,MAAM,OAAO,cAGX,SAAQ,UAA0B;IACjB,YAAY,CAAQ;IAErC,YACE,gBAAoD,EACpD,aAA4B,EAAE;QAE9B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAoB,CAAA;QAC1C,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAC/B,MAAM,UAAU,GAAG,gBAAgB,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAChE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5B,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;YACjC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACrC,CAAC;QACH,CAAC;QACD,KAAK,CAAC,gBAAgB,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAA;QAEnD,qFAAqF;QACrF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,MAAM,CAAA;IAC1D,CAAC;IAED,mDAAmD;IACnD,SAAS;QACP,MAAM,WAAW,GAAI,IAAI,CAAC,QAA2B,CAAC,SAAS,EAAE,CAAA;QACjE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAA;IACjF,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,UAA2B;IAC7D,YAAY,OAAoB,EAAE,MAA0C;QAC1E,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAC9B,CAAC;CACF"}
|
|
@@ -66,6 +66,20 @@ describe('Repository', () => {
|
|
|
66
66
|
expect(save.error?.message).not.toBeDefined();
|
|
67
67
|
expect(save.ok, 'Should not return an error').toBe(true);
|
|
68
68
|
});
|
|
69
|
+
test('should add an aggregate to the cache after saving', async () => {
|
|
70
|
+
const cache = new Map();
|
|
71
|
+
const store = new MockEventStore();
|
|
72
|
+
const testRepo = new TestRepository(store, { cache });
|
|
73
|
+
const res = await Test.create('Test:1', 'foo');
|
|
74
|
+
expect(res.error?.message).not.toBeDefined();
|
|
75
|
+
expect(res.ok, 'Should not return an error').toBe(true);
|
|
76
|
+
if (!res.ok)
|
|
77
|
+
return;
|
|
78
|
+
const save = await testRepo.save(res.value, EventExistenceRevision.NoStream);
|
|
79
|
+
expect(save.error?.message).not.toBeDefined();
|
|
80
|
+
expect(save.ok, 'Should not return an error').toBe(true);
|
|
81
|
+
expect(cache.get(res.value.id)).toEqual(res.value);
|
|
82
|
+
});
|
|
69
83
|
test('should fail when events conflict', async () => {
|
|
70
84
|
const store = new MockEventStore();
|
|
71
85
|
const save = await store.saveEvents(streamName, [testCreated, testRenamed, testRenamedAgain], EventExistenceRevision.NoStream);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Repository.test.js","sourceRoot":"","sources":["../../src/Repository.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Repository.test.js","sourceRoot":"","sources":["../../src/Repository.test.ts"],"names":[],"mappings":"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"}
|