@belopash/typeorm-store 0.0.1 → 0.1.0
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/CHANGELOG.md +4 -0
- package/lib/cacheMap.js +1 -1
- package/lib/cacheMap.js.map +1 -1
- package/lib/database.d.ts.map +1 -1
- package/lib/database.js +1 -0
- package/lib/database.js.map +1 -1
- package/lib/store.d.ts +1 -1
- package/lib/store.d.ts.map +1 -1
- package/lib/store.js +16 -29
- package/lib/store.js.map +1 -1
- package/package.json +1 -1
- package/src/cacheMap.ts +1 -1
- package/src/database.ts +1 -0
- package/src/store.ts +16 -32
package/CHANGELOG.md
CHANGED
package/lib/cacheMap.js
CHANGED
|
@@ -79,7 +79,7 @@ class CacheMap {
|
|
|
79
79
|
cachedEntity.value = em.create(metadata.target);
|
|
80
80
|
this.getLogger().debug(`added entity ${metadata.name} ${entity.id}`);
|
|
81
81
|
}
|
|
82
|
-
this.cacheColumns(metadata.
|
|
82
|
+
this.cacheColumns(metadata.nonVirtualColumns, entity, cachedEntity.value);
|
|
83
83
|
this.cacheRelatedEntities(metadata.relations, entity, cachedEntity.value, mask);
|
|
84
84
|
}
|
|
85
85
|
cacheColumns(columns, sourceEntity, cachedEntity) {
|
package/lib/cacheMap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheMap.js","sourceRoot":"","sources":["../src/cacheMap.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cacheMap.js","sourceRoot":"","sources":["../src/cacheMap.ts"],"names":[],"mappings":"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"}
|
package/lib/database.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,eAAe,EAAE,sBAAsB,EAAC,MAAM,yBAAyB,CAAA;AAE/F,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,wCAAwC,CAAA;AAG5F,OAAO,EAAC,cAAc,EAAC,MAAM,SAAS,CAAA;AAEtC,OAAO,EAAC,cAAc,EAAE,sBAAsB,EAAC,CAAA;AAG/C,qBAAa,wBAAyB,SAAQ,eAAe;IAEzD,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxF,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAIjG,cAAc;
|
|
1
|
+
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,eAAe,EAAE,sBAAsB,EAAC,MAAM,yBAAyB,CAAA;AAE/F,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,wCAAwC,CAAA;AAG5F,OAAO,EAAC,cAAc,EAAC,MAAM,SAAS,CAAA;AAEtC,OAAO,EAAC,cAAc,EAAE,sBAAsB,EAAC,CAAA;AAG/C,qBAAa,wBAAyB,SAAQ,eAAe;IAEzD,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxF,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAIjG,cAAc;CAmB/B"}
|
package/lib/database.js
CHANGED
package/lib/database.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":";;;;;;AAAA,2DAA+F;AAG/F,oDAA2B;AAE3B,mCAAsC;AAItC,aAAa;AACb,MAAa,wBAAyB,SAAQ,+BAAe;IACzD,aAAa;IACb,QAAQ,CAAC,IAAiB,EAAE,EAA4C;QACpE,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAS,CAAC,CAAA;IAC1C,CAAC;IAED,aAAa;IACb,WAAW,CAAC,IAAe,EAAE,EAAkE;QAC3F,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,EAAS,CAAC,CAAA;IAC7C,CAAC;IAEO,KAAK,CAAC,cAAc,CACxB,EAA4C,EAC5C,EAAiB,EACjB,aAA6B;QAE7B,IAAI,OAAO,GAAG,IAAI,CAAA;QAElB,IAAI,KAAK,GAAG,IAAI,sBAAc,CAAC,GAAG,EAAE;YAChC,IAAA,gBAAM,EAAC,OAAO,EAAE,mFAAmF,CAAC,CAAA;YACpG,OAAO,EAAE,CAAA;QACb,CAAC,EAAE,aAAa,CAAC,CAAA;QAEjB,IAAI;YACA,MAAM,EAAE,CAAC,KAAK,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":";;;;;;AAAA,2DAA+F;AAG/F,oDAA2B;AAE3B,mCAAsC;AAItC,aAAa;AACb,MAAa,wBAAyB,SAAQ,+BAAe;IACzD,aAAa;IACb,QAAQ,CAAC,IAAiB,EAAE,EAA4C;QACpE,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAS,CAAC,CAAA;IAC1C,CAAC;IAED,aAAa;IACb,WAAW,CAAC,IAAe,EAAE,EAAkE;QAC3F,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,EAAS,CAAC,CAAA;IAC7C,CAAC;IAEO,KAAK,CAAC,cAAc,CACxB,EAA4C,EAC5C,EAAiB,EACjB,aAA6B;QAE7B,IAAI,OAAO,GAAG,IAAI,CAAA;QAElB,IAAI,KAAK,GAAG,IAAI,sBAAc,CAAC,GAAG,EAAE;YAChC,IAAA,gBAAM,EAAC,OAAO,EAAE,mFAAmF,CAAC,CAAA;YACpG,OAAO,EAAE,CAAA;QACb,CAAC,EAAE,aAAa,CAAC,CAAA;QAEjB,IAAI;YACA,MAAM,EAAE,CAAC,KAAK,CAAC,CAAA;YACf,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;SACtB;gBAAS;YACN,OAAO,GAAG,KAAK,CAAA;SAClB;IACL,CAAC;CACJ;AA9BD,4DA8BC"}
|
package/lib/store.d.ts
CHANGED
|
@@ -39,7 +39,7 @@ export declare class StoreWithCache extends Store {
|
|
|
39
39
|
getOrFail<E extends Entity>(entityClass: EntityTarget<E>, id: string, relations?: FindOptionsRelations<E>): Promise<E>;
|
|
40
40
|
private getCached;
|
|
41
41
|
defer<E extends Entity>(entityClass: EntityTarget<E>, id: string, relations?: FindOptionsRelations<E>): DeferredEntity<E>;
|
|
42
|
-
|
|
42
|
+
commit(): Promise<void>;
|
|
43
43
|
private collectChangeSets;
|
|
44
44
|
flush(): Promise<void>;
|
|
45
45
|
private load;
|
package/lib/store.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,IAAI,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,KAAK,EAAC,MAAM,yBAAyB,CAAA;AACtH,OAAO,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAA;AAI7D,OAAO,EAAC,aAAa,EAAE,YAAY,EAAE,oBAAoB,EAAE,gBAAgB,EAAK,MAAM,SAAS,CAAA;AAQ/F,OAAO,EAAC,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,EAAC,CAAA;AAE7D,MAAM,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE;IAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAAC,SAAS,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAA;CAAC,CAAC,CAAA;AAC5F,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,OAAO,EAAE,MAAM,EAAE,CAAA;CACpB;AAGD,qBAAa,cAAe,SAAQ,KAAK;IAKzB,OAAO,CAAC,EAAE;IAJtB,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,KAAK,CAAU;gBAEH,EAAE,EAAE,MAAM,aAAa,EAAE,OAAO,CAAC,EAAE,aAAa;IAK9D,MAAM,CAAC,CAAC,SAAS,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IACnD,MAAM,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"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"}
|
package/lib/store.js
CHANGED
|
@@ -39,16 +39,10 @@ class StoreWithCache extends typeorm_store_1.Store {
|
|
|
39
39
|
return;
|
|
40
40
|
const entityClass = entities[0].constructor;
|
|
41
41
|
const metadata = em.connection.getMetadata(entityClass);
|
|
42
|
-
const relationMask = {};
|
|
43
|
-
for (const relation of metadata.relations) {
|
|
44
|
-
if (relation.isOwning) {
|
|
45
|
-
relationMask[relation.propertyName] = true;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
42
|
const updateMap = this.getUpdateMap(entityClass);
|
|
49
43
|
for (const entity of entities) {
|
|
50
44
|
updateMap.insert(entity.id);
|
|
51
|
-
this.cache.add(entity
|
|
45
|
+
this.cache.add(entity);
|
|
52
46
|
}
|
|
53
47
|
}
|
|
54
48
|
async upsert(e) {
|
|
@@ -60,15 +54,8 @@ class StoreWithCache extends typeorm_store_1.Store {
|
|
|
60
54
|
const metadata = em.connection.getMetadata(entityClass);
|
|
61
55
|
const updateMap = this.getUpdateMap(entityClass);
|
|
62
56
|
for (const entity of entities) {
|
|
63
|
-
const relationMask = {};
|
|
64
|
-
for (const relation of metadata.relations) {
|
|
65
|
-
const relatedEntity = relation.getEntityValue(entity);
|
|
66
|
-
if (relation.isOwning && relatedEntity !== undefined) {
|
|
67
|
-
relationMask[relation.propertyName] = true;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
57
|
updateMap.upsert(entity.id);
|
|
71
|
-
this.cache.add(entity
|
|
58
|
+
this.cache.add(entity);
|
|
72
59
|
}
|
|
73
60
|
}
|
|
74
61
|
async save(e) {
|
|
@@ -100,50 +87,50 @@ class StoreWithCache extends typeorm_store_1.Store {
|
|
|
100
87
|
}
|
|
101
88
|
}
|
|
102
89
|
async count(entityClass, options) {
|
|
103
|
-
await this.
|
|
90
|
+
await this.commit();
|
|
104
91
|
return await super.count(entityClass, options);
|
|
105
92
|
}
|
|
106
93
|
async countBy(entityClass, where) {
|
|
107
|
-
await this.
|
|
94
|
+
await this.commit();
|
|
108
95
|
return await super.countBy(entityClass, where);
|
|
109
96
|
}
|
|
110
97
|
async find(entityClass, options) {
|
|
111
|
-
await this.
|
|
98
|
+
await this.commit();
|
|
112
99
|
const res = await super.find(entityClass, options);
|
|
113
100
|
if (res != null)
|
|
114
101
|
this.cache.add(res, options.relations);
|
|
115
102
|
return res;
|
|
116
103
|
}
|
|
117
104
|
async findBy(entityClass, where) {
|
|
118
|
-
await this.
|
|
105
|
+
await this.commit();
|
|
119
106
|
const res = await super.findBy(entityClass, where);
|
|
120
107
|
if (res != null)
|
|
121
108
|
this.cache.add(res);
|
|
122
109
|
return res;
|
|
123
110
|
}
|
|
124
111
|
async findOne(entityClass, options) {
|
|
125
|
-
await this.
|
|
112
|
+
await this.commit();
|
|
126
113
|
const res = await super.findOne(entityClass, options);
|
|
127
114
|
if (res != null)
|
|
128
115
|
this.cache.add(res, options.relations);
|
|
129
116
|
return res;
|
|
130
117
|
}
|
|
131
118
|
async findOneOrFail(entityClass, options) {
|
|
132
|
-
await this.
|
|
119
|
+
await this.commit();
|
|
133
120
|
const res = await super.findOneOrFail(entityClass, options);
|
|
134
121
|
if (res != null)
|
|
135
122
|
this.cache.add(res, options.relations);
|
|
136
123
|
return res;
|
|
137
124
|
}
|
|
138
125
|
async findOneBy(entityClass, where) {
|
|
139
|
-
await this.
|
|
126
|
+
await this.commit();
|
|
140
127
|
const res = await super.findOneBy(entityClass, where);
|
|
141
128
|
if (res != null)
|
|
142
129
|
this.cache.add(res);
|
|
143
130
|
return res;
|
|
144
131
|
}
|
|
145
132
|
async findOneByOrFail(entityClass, where) {
|
|
146
|
-
await this.
|
|
133
|
+
await this.commit();
|
|
147
134
|
const res = await super.findOneByOrFail(entityClass, where);
|
|
148
135
|
if (res != null)
|
|
149
136
|
this.cache.add(res);
|
|
@@ -216,7 +203,7 @@ class StoreWithCache extends typeorm_store_1.Store {
|
|
|
216
203
|
getOrFail: async () => this.getOrFail(entityClass, id, relations),
|
|
217
204
|
});
|
|
218
205
|
}
|
|
219
|
-
async
|
|
206
|
+
async commit() {
|
|
220
207
|
const log = this.getLogger();
|
|
221
208
|
const entityOrder = this.getTopologicalOrder();
|
|
222
209
|
const entityOrderReversed = [...entityOrder].reverse();
|
|
@@ -229,18 +216,18 @@ class StoreWithCache extends typeorm_store_1.Store {
|
|
|
229
216
|
const changeSet = changeSets.get(name);
|
|
230
217
|
if (changeSet == null)
|
|
231
218
|
continue;
|
|
232
|
-
log.debug(`
|
|
219
|
+
log.debug(`commit upserts for ${name} (${changeSet.upserts.length})`);
|
|
233
220
|
await super.upsert(changeSet.upserts);
|
|
234
|
-
log.debug(`
|
|
221
|
+
log.debug(`commit inserts for ${name} (${changeSet.inserts.length})`);
|
|
235
222
|
await super.insert(changeSet.inserts);
|
|
236
|
-
log.debug(`
|
|
223
|
+
log.debug(`commit delayed updates for ${name} (${changeSet.delayedUpserts.length})`);
|
|
237
224
|
await super.upsert(changeSet.delayedUpserts);
|
|
238
225
|
}
|
|
239
226
|
for (const name of entityOrderReversed) {
|
|
240
227
|
const changeSet = changeSets.get(name);
|
|
241
228
|
if (changeSet == null)
|
|
242
229
|
continue;
|
|
243
|
-
log.debug(`
|
|
230
|
+
log.debug(`commit removes for ${name} (${changeSet.removes.length})`);
|
|
244
231
|
await super.remove(changeSet.removes);
|
|
245
232
|
}
|
|
246
233
|
this.updates.clear();
|
|
@@ -291,7 +278,7 @@ class StoreWithCache extends typeorm_store_1.Store {
|
|
|
291
278
|
return { inserts, upserts, delayedUpserts, removes };
|
|
292
279
|
}
|
|
293
280
|
async flush() {
|
|
294
|
-
await this.
|
|
281
|
+
await this.commit();
|
|
295
282
|
this.cache.clear();
|
|
296
283
|
}
|
|
297
284
|
async load() {
|
package/lib/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/cacheMap.ts
CHANGED
|
@@ -90,7 +90,7 @@ export class CacheMap {
|
|
|
90
90
|
this.getLogger().debug(`added entity ${metadata.name} ${entity.id}`)
|
|
91
91
|
}
|
|
92
92
|
|
|
93
|
-
this.cacheColumns(metadata.
|
|
93
|
+
this.cacheColumns(metadata.nonVirtualColumns, entity, cachedEntity.value)
|
|
94
94
|
this.cacheRelatedEntities(metadata.relations, entity, cachedEntity.value, mask)
|
|
95
95
|
}
|
|
96
96
|
|
package/src/database.ts
CHANGED
package/src/store.ts
CHANGED
|
@@ -43,17 +43,10 @@ export class StoreWithCache extends Store {
|
|
|
43
43
|
const entityClass = entities[0].constructor
|
|
44
44
|
const metadata = em.connection.getMetadata(entityClass)
|
|
45
45
|
|
|
46
|
-
const relationMask: FindOptionsRelations<any> = {}
|
|
47
|
-
for (const relation of metadata.relations) {
|
|
48
|
-
if (relation.isOwning) {
|
|
49
|
-
relationMask[relation.propertyName] = true
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
|
|
53
46
|
const updateMap = this.getUpdateMap(entityClass)
|
|
54
47
|
for (const entity of entities) {
|
|
55
48
|
updateMap.insert(entity.id)
|
|
56
|
-
this.cache.add(entity
|
|
49
|
+
this.cache.add(entity)
|
|
57
50
|
}
|
|
58
51
|
}
|
|
59
52
|
|
|
@@ -70,17 +63,8 @@ export class StoreWithCache extends Store {
|
|
|
70
63
|
|
|
71
64
|
const updateMap = this.getUpdateMap(entityClass)
|
|
72
65
|
for (const entity of entities) {
|
|
73
|
-
const relationMask: FindOptionsRelations<any> = {}
|
|
74
|
-
for (const relation of metadata.relations) {
|
|
75
|
-
const relatedEntity = relation.getEntityValue(entity) as Entity | null | undefined
|
|
76
|
-
|
|
77
|
-
if (relation.isOwning && relatedEntity !== undefined) {
|
|
78
|
-
relationMask[relation.propertyName] = true
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
|
|
82
66
|
updateMap.upsert(entity.id)
|
|
83
|
-
this.cache.add(entity
|
|
67
|
+
this.cache.add(entity)
|
|
84
68
|
}
|
|
85
69
|
}
|
|
86
70
|
|
|
@@ -122,7 +106,7 @@ export class StoreWithCache extends Store {
|
|
|
122
106
|
}
|
|
123
107
|
|
|
124
108
|
async count<E extends Entity>(entityClass: EntityTarget<E>, options?: FindManyOptions<E>): Promise<number> {
|
|
125
|
-
await this.
|
|
109
|
+
await this.commit()
|
|
126
110
|
return await super.count(entityClass as EntityClass<E>, options)
|
|
127
111
|
}
|
|
128
112
|
|
|
@@ -130,12 +114,12 @@ export class StoreWithCache extends Store {
|
|
|
130
114
|
entityClass: EntityTarget<E>,
|
|
131
115
|
where: FindOptionsWhere<E> | FindOptionsWhere<E>[]
|
|
132
116
|
): Promise<number> {
|
|
133
|
-
await this.
|
|
117
|
+
await this.commit()
|
|
134
118
|
return await super.countBy(entityClass as EntityClass<E>, where)
|
|
135
119
|
}
|
|
136
120
|
|
|
137
121
|
async find<E extends Entity>(entityClass: EntityTarget<E>, options: FindManyOptions<E>): Promise<E[]> {
|
|
138
|
-
await this.
|
|
122
|
+
await this.commit()
|
|
139
123
|
const res = await super.find(entityClass as EntityClass<E>, options)
|
|
140
124
|
if (res != null) this.cache.add(res, options.relations)
|
|
141
125
|
return res
|
|
@@ -145,21 +129,21 @@ export class StoreWithCache extends Store {
|
|
|
145
129
|
entityClass: EntityTarget<E>,
|
|
146
130
|
where: FindOptionsWhere<E> | FindOptionsWhere<E>[]
|
|
147
131
|
): Promise<E[]> {
|
|
148
|
-
await this.
|
|
132
|
+
await this.commit()
|
|
149
133
|
const res = await super.findBy(entityClass as EntityClass<E>, where)
|
|
150
134
|
if (res != null) this.cache.add(res)
|
|
151
135
|
return res
|
|
152
136
|
}
|
|
153
137
|
|
|
154
138
|
async findOne<E extends Entity>(entityClass: EntityTarget<E>, options: FindOneOptions<E>): Promise<E | undefined> {
|
|
155
|
-
await this.
|
|
139
|
+
await this.commit()
|
|
156
140
|
const res = await super.findOne(entityClass as EntityClass<E>, options)
|
|
157
141
|
if (res != null) this.cache.add(res, options.relations)
|
|
158
142
|
return res
|
|
159
143
|
}
|
|
160
144
|
|
|
161
145
|
async findOneOrFail<E extends Entity>(entityClass: EntityTarget<E>, options: FindOneOptions<E>): Promise<E> {
|
|
162
|
-
await this.
|
|
146
|
+
await this.commit()
|
|
163
147
|
const res = await super.findOneOrFail(entityClass as EntityClass<E>, options)
|
|
164
148
|
if (res != null) this.cache.add(res, options.relations)
|
|
165
149
|
return res
|
|
@@ -169,7 +153,7 @@ export class StoreWithCache extends Store {
|
|
|
169
153
|
entityClass: EntityTarget<E>,
|
|
170
154
|
where: FindOptionsWhere<E> | FindOptionsWhere<E>[]
|
|
171
155
|
): Promise<E | undefined> {
|
|
172
|
-
await this.
|
|
156
|
+
await this.commit()
|
|
173
157
|
const res = await super.findOneBy(entityClass as EntityClass<E>, where)
|
|
174
158
|
if (res != null) this.cache.add(res)
|
|
175
159
|
return res
|
|
@@ -179,7 +163,7 @@ export class StoreWithCache extends Store {
|
|
|
179
163
|
entityClass: EntityTarget<E>,
|
|
180
164
|
where: FindOptionsWhere<E> | FindOptionsWhere<E>[]
|
|
181
165
|
): Promise<E> {
|
|
182
|
-
await this.
|
|
166
|
+
await this.commit()
|
|
183
167
|
const res = await super.findOneByOrFail(entityClass as EntityClass<E>, where)
|
|
184
168
|
if (res != null) this.cache.add(res)
|
|
185
169
|
return res
|
|
@@ -281,7 +265,7 @@ export class StoreWithCache extends Store {
|
|
|
281
265
|
})
|
|
282
266
|
}
|
|
283
267
|
|
|
284
|
-
|
|
268
|
+
async commit(): Promise<void> {
|
|
285
269
|
const log = this.getLogger()
|
|
286
270
|
|
|
287
271
|
const entityOrder = this.getTopologicalOrder()
|
|
@@ -297,13 +281,13 @@ export class StoreWithCache extends Store {
|
|
|
297
281
|
const changeSet = changeSets.get(name)
|
|
298
282
|
if (changeSet == null) continue
|
|
299
283
|
|
|
300
|
-
log.debug(`
|
|
284
|
+
log.debug(`commit upserts for ${name} (${changeSet.upserts.length})`)
|
|
301
285
|
await super.upsert(changeSet.upserts)
|
|
302
286
|
|
|
303
|
-
log.debug(`
|
|
287
|
+
log.debug(`commit inserts for ${name} (${changeSet.inserts.length})`)
|
|
304
288
|
await super.insert(changeSet.inserts)
|
|
305
289
|
|
|
306
|
-
log.debug(`
|
|
290
|
+
log.debug(`commit delayed updates for ${name} (${changeSet.delayedUpserts.length})`)
|
|
307
291
|
await super.upsert(changeSet.delayedUpserts)
|
|
308
292
|
}
|
|
309
293
|
|
|
@@ -311,7 +295,7 @@ export class StoreWithCache extends Store {
|
|
|
311
295
|
const changeSet = changeSets.get(name)
|
|
312
296
|
if (changeSet == null) continue
|
|
313
297
|
|
|
314
|
-
log.debug(`
|
|
298
|
+
log.debug(`commit removes for ${name} (${changeSet.removes.length})`)
|
|
315
299
|
await super.remove(changeSet.removes)
|
|
316
300
|
}
|
|
317
301
|
|
|
@@ -370,7 +354,7 @@ export class StoreWithCache extends Store {
|
|
|
370
354
|
}
|
|
371
355
|
|
|
372
356
|
async flush(): Promise<void> {
|
|
373
|
-
await this.
|
|
357
|
+
await this.commit()
|
|
374
358
|
this.cache.clear()
|
|
375
359
|
}
|
|
376
360
|
|