npm - @belopash/typeorm-store - Versions diffs - 2.0.0-rc.8 → 2.0.0-rc.9 - Mend

@belopash/typeorm-store 2.0.0-rc.8 → 2.0.0-rc.9

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.

Files changed (16) hide show

package/lib/store.d.ts +1 -0
package/lib/store.d.ts.map +1 -1
package/lib/store.js +35 -5
package/lib/store.js.map +1 -1
package/lib/utils/cacheMap.d.ts +7 -6
package/lib/utils/cacheMap.d.ts.map +1 -1
package/lib/utils/cacheMap.js +20 -16
package/lib/utils/cacheMap.js.map +1 -1
package/lib/utils/stateManager.d.ts +2 -1
package/lib/utils/stateManager.d.ts.map +1 -1
package/lib/utils/stateManager.js +1 -1
package/lib/utils/stateManager.js.map +1 -1
package/package.json +1 -1
package/src/store.ts +38 -6
package/src/utils/cacheMap.ts +22 -17
package/src/utils/stateManager.ts +4 -2

package/lib/store.d.ts CHANGED Viewed

@@ -135,6 +135,7 @@ export declare class Store {
     private performWrite;
     private assertNotClosed;
     private cacheEntity;
+    private persistReturnedGraph;
     private touchReturnedGraph;
     private getEntityMetadata;
     private traverseEntity;

package/lib/store.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EAGb,gBAAgB,EAChB,oBAAoB,EACpB,gBAAgB,EAEnB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAa,YAAY,EAAC,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAC,aAAa,EAA2B,MAAM,cAAc,CAAA;AAIpE,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAEnC,OAAO,EAAC,YAAY,EAAE,aAAa,EAAC,CAAA;AAEpC,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IAC/B,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAA;IACnC,aAAa,CAAC,EAAE,OAAO,CAAA;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,GAAG;IACxC;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAA;IAC7D;;OAEG;IACH,SAAS,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAA;IACxC;;OAEG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;IAEhC,aAAa,CAAC,EAAE,OAAO,CAAA;CAC1B;AAED,MAAM,WAAW,eAAe,CAAC,MAAM,GAAG,GAAG,CAAE,SAAQ,cAAc,CAAC,MAAM,CAAC;IACzE;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,aAAa,CAAC,EAAE,OAAO,CAAA;CAC1B;AAED,MAAM,WAAW,YAAY;IACzB,EAAE,EAAE,aAAa,CAAA;IACjB,KAAK,EAAE,YAAY,CAAA;IACnB,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,uBAAuB,EAAE,OAAO,CAAA;IAChC,aAAa,EAAE,OAAO,CAAA;CACzB;AAED,MAAM,WAAW,YAAY;IACzB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB;AAED;;GAEG;AACH,qBAAa,KAAK;IACd,SAAS,CAAC,EAAE,EAAE,aAAa,CAAA;IAC3B,SAAS,CAAC,KAAK,EAAE,YAAY,CAAA;IAC7B,SAAS,CAAC,MAAM,EAAE,SAAS,CAAA;IAC3B,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAA;IACjC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IAEzB,SAAS,CAAC,uBAAuB,EAAE,OAAO,CAAA;IAC1C,SAAS,CAAC,aAAa,EAAE,OAAO,CAAA;IAEhC,SAAS,CAAC,WAAW,EAAE,KAAK,CAAA;IAC5B,SAAS,CAAC,WAAW,EAAE,KAAK,CAAA;IAC5B,SAAS,CAAC,QAAQ,UAAQ;gBAEd,EAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAC,EAAE,YAAY;IAY/D,KAAK,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC;IACtF,KAAK,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;YAUpF,IAAI;IA6BlB;;;;;;;;;OASG;IACG,KAAK,CAAC,CAAC,SAAS,aAAa,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBvF,OAAO,CAAC,cAAc;YASR,OAAO;YAqBP,UAAU;YAMV,OAAO;YAMP,UAAU;IAMxB;;;;OAIG;IACG,MAAM,CAAC,CAAC,SAAS,aAAa,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1D,MAAM,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpG;;OAEG;IACH,MAAM,CAAC,CAAC,SAAS,aAAa,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1D,MAAM,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAKhF,OAAO;YAMP,UAAU;IAMlB,KAAK,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAMtG,OAAO,CAAC,CAAC,SAAS,aAAa,EACjC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,GACnD,OAAO,CAAC,MAAM,CAAC;IAIZ,IAAI,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAgBjG,MAAM,CAAC,CAAC,SAAS,aAAa,EAChC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,GACnD,OAAO,CAAC,CAAC,EAAE,CAAC;IAIT,OAAO,CAAC,CAAC,SAAS,aAAa,EACjC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,GAC3B,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAiBnB,SAAS,CAAC,CAAC,SAAS,aAAa,EACnC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,GACnD,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAInB,aAAa,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAOvG,eAAe,CAAC,CAAC,SAAS,aAAa,EACzC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,GACnD,OAAO,CAAC,CAAC,CAAC;IAOP,GAAG,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IACzF,GAAG,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAoBrG,SAAS,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IACnF,SAAS,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAU/F,WAAW,CAAC,CAAC,SAAS,aAAa,EACrC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GACvC,OAAO,CAAC,CAAC,CAAC;IACP,WAAW,CAAC,CAAC,SAAS,aAAa,EACrC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,EACtB,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GACvC,OAAO,CAAC,CAAC,CAAC;IAiBb,KAAK,IAAI,IAAI;IAIP,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAKd,WAAW;YAMX,YAAY;IAS1B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;~~IAUnB~~,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,cAAc;CAmBzB;AAiBD,qBAAa,cAAc,CAAC,CAAC,SAAS,aAAa;IACnC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;IAAE,OAAO,CAAC,KAAK;gBAApE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAW,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAU,KAAK,EAAE,KAAK;IAE1F,GAAG,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAI7B,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC;IAIvB,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAGxE"}
1	+ {"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"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"}

package/lib/store.js CHANGED Viewed

@@ -172,10 +172,10 @@ class Store {
     async find(target, options) {
         return await this.performRead(async () => {
             const { cacheEntities, ...opts } = options;
-            const res = await this.em.find(target, opts);
+            let res = await this.em.find(target, opts);
             if (cacheEntities ?? this.cacheEntities) {
+                res = res.map((e) => this.cacheEntity(target, e) ?? e);
                 for (const e of res) {
-                    this.cacheEntity(target, e);
                     this.touchReturnedGraph(e);
                 }
             }
@@ -188,10 +188,10 @@ class Store {
     async findOne(target, options) {
         return await this.performRead(async () => {
             const { cacheEntities, ...opts } = options;
-            const res = await this.em.findOne(target, opts).then(misc_1.noNull);
+            let res = await this.em.findOne(target, opts).then(misc_1.noNull);
             if (cacheEntities ?? this.cacheEntities) {
                 const idOrEntity = res || getIdFromWhere(options.where);
-                this.cacheEntity(target, idOrEntity);
+                res = this.cacheEntity(target, idOrEntity) ?? res;
                 if (res != null) {
                     this.touchReturnedGraph(res);
                 }
@@ -296,10 +296,40 @@ class Store {
             return;
         if (typeof entityOrId === 'string') {
             this.state.persist(target, entityOrId);
+            return;
         }
         else {
-            this.traverseEntity(entityOrId, (e, md) => this.state.persist(md.target, e));
+            return this.persistReturnedGraph(entityOrId);
+        }
+    }
+    persistReturnedGraph(entity) {
+        const metadata = this.getEntityMetadata(entity.constructor);
+        for (const relation of metadata.relations) {
+            const inverseEntity = relation.getEntityValue(entity);
+            if (inverseEntity === undefined)
+                continue;
+            if (inverseEntity === null) {
+                continue;
+            }
+            else if (relation.isOneToMany || relation.isManyToMany) {
+                relation.setEntityValue(entity, inverseEntity.map((ie) => this.persistReturnedGraph(ie)));
+            }
+            else {
+                relation.setEntityValue(entity, this.persistReturnedGraph(inverseEntity));
+            }
+        }
+        const canonical = this.state.persist(metadata.target, entity);
+        if (canonical !== entity) {
+            for (const relation of metadata.relations) {
+                const inverseEntity = relation.getEntityValue(entity);
+                if (inverseEntity === undefined)
+                    continue;
+                if (relation.getEntityValue(canonical) !== undefined)
+                    continue;
+                relation.setEntityValue(canonical, inverseEntity);
+            }
         }
+        return canonical;
     }
     touchReturnedGraph(entity) {
         this.traverseEntity(entity, (e) => this.state.touchEntity(e));

package/lib/store.js.map CHANGED Viewed

	@@ -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/lib/utils/cacheMap.d.ts CHANGED Viewed

@@ -27,11 +27,12 @@ export declare class CacheMap {
      *
      * `fromQuery` — the entity came from a TypeORM query. If no instance is cached yet,
      * stores it and captures a baseline snapshot for dirty detection. If a different
-     * instance is already cached, the cached one is kept (it may be a reference already
-     * handed back to user code in a concurrent read); the baseline is only refreshed
-     * when that cached instance is still clean (no in-memory mutations vs. its baseline).
-     * This avoids silently dropping mutations made through one reference when a parallel
-     * `find()` re-loads the same row through a JOIN and traverses it through `persist`.
+     * instance is already cached, the cached one remains canonical (it may be a reference
+     * already handed back to user code in a concurrent read) and is returned to the caller.
+     * Clean cached instances are refreshed from the query row; dirty cached instances keep
+     * their in-memory mutations. This avoids silently dropping mutations made through one
+     * reference when a parallel `find()` re-loads the same row through a JOIN and traverses
+     * it through `persist`.
      *
      * `overwrite` — the caller explicitly requested upsert semantics (`replace: true`);
      * replaces any existing instance without touching `loadedFromDb` / `baseline`.
@@ -41,7 +42,7 @@ export declare class CacheMap {
     add<E extends EntityLiteral>(metadata: EntityMetadata, entity: E, opts?: {
         fromQuery?: boolean;
         overwrite?: boolean;
-    }): void;
+    }): E;
     private getEntityCache;
 }
 //# sourceMappingURL=cacheMap.d.ts.map

package/lib/utils/cacheMap.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cacheMap.d.ts","sourceRoot":"","sources":["../../src/utils/cacheMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,SAAS,CAAA;AACtC,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AAEvC,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,EAAE,CAEhG;AAQD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAM7G;~~AAED~~,qBAAa,YAAY,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa;IAC7D,KAAK,EAAE,CAAC,GAAG,IAAI,CAAO;IACtB,YAAY,UAAQ;IACpB,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAO;CACpC;AAED,qBAAa,QAAQ;IACjB,OAAO,CAAC,GAAG,CAA4D;IACvE,OAAO,CAAC,MAAM,CAAC,CAAQ;gBAEX,MAAM,CAAC,EAAE,MAAM;IAI3B,GAAG,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAInE,GAAG,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO;IAIlD,MAAM,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAQlD,MAAM,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAKlD,KAAK,IAAI,IAAI;IAKb;;;OAGG;IACH,sBAAsB,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAO7E~~;;;;;;;;;;;;;;;OAeG~~;IACH,GAAG,CAAC,CAAC,SAAS,aAAa,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,~~IAAI~~;~~IAuD1H~~,OAAO,CAAC,cAAc;CAQzB"}
1	+ {"version":3,"file":"cacheMap.d.ts","sourceRoot":"","sources":["../../src/utils/cacheMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,SAAS,CAAA;AACtC,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AAEvC,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,EAAE,CAEhG;AAQD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAM7G;AAQD,qBAAa,YAAY,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa;IAC7D,KAAK,EAAE,CAAC,GAAG,IAAI,CAAO;IACtB,YAAY,UAAQ;IACpB,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAO;CACpC;AAED,qBAAa,QAAQ;IACjB,OAAO,CAAC,GAAG,CAA4D;IACvE,OAAO,CAAC,MAAM,CAAC,CAAQ;gBAEX,MAAM,CAAC,EAAE,MAAM;IAI3B,GAAG,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAInE,GAAG,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO;IAIlD,MAAM,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAQlD,MAAM,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAKlD,KAAK,IAAI,IAAI;IAKb;;;OAGG;IACH,sBAAsB,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAO7E;;;;;;;;;;;;;;;;OAgBG;IACH,GAAG,CAAC,CAAC,SAAS,aAAa,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,CAAC;IAqDvH,OAAO,CAAC,cAAc;CAQzB"}

package/lib/utils/cacheMap.js CHANGED Viewed

@@ -21,6 +21,11 @@ function isSnapshotDirty(metadata, entity, baseline) {
     }
     return false;
 }
+function copyColumnValues(metadata, from, to) {
+    for (const col of metadata.nonVirtualColumns) {
+        col.setEntityValue(to, col.getEntityValue(from));
+    }
+}
 class CachedEntity {
     constructor() {
         this.value = null;
@@ -71,11 +76,12 @@ class CacheMap {
      *
      * `fromQuery` — the entity came from a TypeORM query. If no instance is cached yet,
      * stores it and captures a baseline snapshot for dirty detection. If a different
-     * instance is already cached, the cached one is kept (it may be a reference already
-     * handed back to user code in a concurrent read); the baseline is only refreshed
-     * when that cached instance is still clean (no in-memory mutations vs. its baseline).
-     * This avoids silently dropping mutations made through one reference when a parallel
-     * `find()` re-loads the same row through a JOIN and traverses it through `persist`.
+     * instance is already cached, the cached one remains canonical (it may be a reference
+     * already handed back to user code in a concurrent read) and is returned to the caller.
+     * Clean cached instances are refreshed from the query row; dirty cached instances keep
+     * their in-memory mutations. This avoids silently dropping mutations made through one
+     * reference when a parallel `find()` re-loads the same row through a JOIN and traverses
+     * it through `persist`.
      *
      * `overwrite` — the caller explicitly requested upsert semantics (`replace: true`);
      * replaces any existing instance without touching `loadedFromDb` / `baseline`.
@@ -96,33 +102,31 @@ class CacheMap {
                 cached.baseline = captureColumnSnapshot(metadata, entity);
             }
             this.logger?.debug(`added entity ${metadata.name} ${entity.id}`);
-            return;
+            return entity;
         }
         if (cached.value === entity)
-            return;
+            return entity;
         if (opts?.fromQuery) {
-            // Preserve the canonical cached instance: a concurrent reader may already
-            // hold a reference to it and be about to mutate it. Replacing it here would
-            // silently drop those mutations and reset the baseline to the freshly-loaded
-            // (untouched) row, so dirty-detection at sync time would miss the change.
+            // Preserve the canonical cached instance: a concurrent reader may already hold
+            // a reference to it and be about to mutate it. Replacing it here would silently
+            // drop those mutations. Return the canonical instance so query callers mutate a
+            // tracked object even when TypeORM loaded a fresh duplicate for the same row.
             const cachedValue = cached.value;
             const cachedClean = cached.loadedFromDb &&
                 cached.baseline != null &&
                 !isSnapshotDirty(metadata, cachedValue, cached.baseline);
             if (cachedClean || !cached.loadedFromDb) {
-                // Cached instance has no pending in-memory mutations (or has never been
-                // associated with a DB baseline at all). Safe to align baseline to the
-                // latest DB read so future dirty detection works against fresh data.
+                copyColumnValues(metadata, entity, cachedValue);
                 cached.baseline = captureColumnSnapshot(metadata, cachedValue);
             }
             cached.loadedFromDb = true;
             this.logger?.debug(`refreshed entity from query ${metadata.name} ${entity.id}`);
-            return;
+            return cachedValue;
         }
         if (opts?.overwrite) {
             cached.value = entity;
             this.logger?.debug(`replaced entity (overwrite) ${metadata.name} ${entity.id}`);
-            return;
+            return entity;
         }
         throw new Error(`Entity ${metadata.name} ${entity.id} is already in the store cache with a different object instance. ` +
             `Use getOrCreate() to obtain or create the canonical instance, or fetch it with get()/find() and mutate it in place. ` +

package/lib/utils/cacheMap.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cacheMap.js","sourceRoot":"","sources":["../../src/utils/cacheMap.ts"],"names":[],"mappings":"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~~;;;;;;;;;;;;;;;OAeG~~;IACH,GAAG,CAA0B,QAAwB,EAAE,MAAS,EAAE,IAAiD;QAC/G,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QAE9C,IAAI,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACpC,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACjB,MAAM,GAAG,IAAI,YAAY,EAAE,CAAA;YAC3B,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QACnC,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,KAAK,GAAG,MAAM,CAAA;YACrB,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC;gBAClB,MAAM,CAAC,YAAY,GAAG,IAAI,CAAA;gBAC1B,MAAM,CAAC,QAAQ,GAAG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAC7D,CAAC;YACD,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,gBAAgB,QAAQ,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;YAChE,~~OAAM~~;~~QACV~~,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,KAAK,MAAM;YAAE,~~OAAM~~;~~QAEnC~~,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC;YAClB~~,0EAA0E~~;~~YAC1E~~,~~4EAA4E~~;~~YAC5E~~,~~6EAA6E~~;~~YAC7E~~,~~0EAA0E~~;~~YAC1E~~,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAA;YAChC,MAAM,WAAW,GACb,MAAM,CAAC,YAAY;gBACnB,MAAM,CAAC,QAAQ,IAAI,IAAI;gBACvB,CAAC,eAAe,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;YAC5D,IAAI,WAAW,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;gBACtC,~~wEAAwE;gBACxE~~,~~uEAAuE;gBACvE~~,~~qEAAqE~~;~~gBACrE~~,MAAM,CAAC,QAAQ,GAAG,qBAAqB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;YAClE,CAAC;YACD,MAAM,CAAC,YAAY,GAAG,IAAI,CAAA;YAC1B,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,+BAA+B,QAAQ,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;YAC/E,~~OAAM~~;~~QACV~~,CAAC;QAED,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,GAAG,MAAM,CAAA;YACrB,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,+BAA+B,QAAQ,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;YAC/E,~~OAAM~~;~~QACV~~,CAAC;QAED,MAAM,IAAI,KAAK,CACX,UAAU,QAAQ,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,mEAAmE;YACnG,sHAAsH;YACtH,gFAAgF,CACvF,CAAA;IACL,CAAC;IAEO,cAAc,CAA0B,QAAwB;QACpE,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAChC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YACd,GAAG,GAAG,IAAI,GAAG,EAAE,CAAA;YACf,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;QAC/B,CAAC;QACD,OAAO,GAAmC,CAAA;IAC9C,CAAC;CACJ;~~AA5HD~~,~~4BA4HC~~"}
1	+ {"version":3,"file":"cacheMap.js","sourceRoot":"","sources":["../../src/utils/cacheMap.ts"],"names":[],"mappings":"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"}

package/lib/utils/stateManager.d.ts CHANGED Viewed

@@ -41,7 +41,8 @@ export declare class StateManager {
     insert(entity: EntityLiteral): void;
     upsert(entity: EntityLiteral): void;
     delete(target: EntityTarget<any>, id: string): void;
-    persist(target: EntityTarget<any>, entity: EntityLiteral | string): void;
+    persist(target: EntityTarget<any>, id: string): void;
+    persist<E extends EntityLiteral>(target: EntityTarget<any>, entity: E): E;
     isInserted(target: EntityTarget<any>, id: string): boolean;
     isUpserted(target: EntityTarget<any>, id: string): boolean;
     isDeleted(target: EntityTarget<any>, id: string): boolean;

package/lib/utils/stateManager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"stateManager.d.ts","sourceRoot":"","sources":["../../src/utils/stateManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AAGvC,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,oBAAoB,EAAC,MAAM,SAAS,CAAA;AACtF,OAAO,EAAC,QAAQ,EAAkB,MAAM,YAAY,CAAA;AACpD,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAA;AAGpC,oBAAY,UAAU;IAClB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;CACpB;AAED,MAAM,MAAM,eAAe,GAAG;IAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAC;IAAC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAAC,CAAA;AAC5G,MAAM,MAAM,eAAe,GAAG;IAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAC;IAAC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAAC,CAAA;AAC5G,MAAM,MAAM,eAAe,GAAG;IAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAA;CAAC,CAAA;AAEhG,MAAM,MAAM,SAAS,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe,CAAA;AAE3E,qBAAa,YAAY;IACrB,SAAS,CAAC,UAAU,EAAE,UAAU,CAAA;IAChC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAC5B,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;IAChE,SAAS,CAAC,WAAW,EAAE,cAAc,EAAE,CAAA;IACvC,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;IACrD,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAY;gBAEtD,EAAC,UAAU,EAAE,MAAM,EAAC,EAAE;QAAC,UAAU,EAAE,UAAU,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAC;IAY3E,WAAW,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAUxC,SAAS,IAAI,OAAO;IAQpB,GAAG,CAAC,CAAC,SAAS,aAAa,EACvB,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,EAAE,EAAE,MAAM,EACV,YAAY,CAAC,EAAE,oBAAoB,CAAC,GAAG,CAAC,GACzC,CAAC,GAAG,IAAI,GAAG,SAAS;IA0CvB,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAoBnC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAqBnC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAkBnD,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,~~MAAM~~,EAAE,aAAa,GAAG,MAAM;~~IAUjE~~,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM;IAKhD,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM;IAKhD,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM;IAK/C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM;IAK9C,KAAK,IAAI,IAAI;IAOb,OAAO,CAAC,yBAAyB;IAgB3B,aAAa,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC;IAkG1D,OAAO,CAAC,sBAAsB;IAyC9B,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,UAAU;CAQrB"}
1	+ {"version":3,"file":"stateManager.d.ts","sourceRoot":"","sources":["../../src/utils/stateManager.ts"],"names":[],"mappings":"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"}

package/lib/utils/stateManager.js CHANGED Viewed

@@ -145,7 +145,7 @@ class StateManager {
         }
         else {
             this.getChanges(metadata).delete(entity.id);
-            this.cacheMap.add(metadata, entity, { fromQuery: true });
+            return this.cacheMap.add(metadata, entity, { fromQuery: true });
         }
     }
     isInserted(target, id) {

package/lib/utils/stateManager.js.map CHANGED Viewed

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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@belopash/typeorm-store",
-    "version": "2.0.0-rc.8",
+    "version": "2.0.0-rc.9",
     "description": "Optimized TypeORM based storage for squid mappings",
     "repository": {
         "url": "git+https://github.com/belopash/squid-typeorm-store.git"

package/src/store.ts CHANGED Viewed

@@ -294,10 +294,10 @@ export class Store {
         return await this.performRead(async () => {
             const {cacheEntities, ...opts} = options
-            const res = await this.em.find(target, opts)
+            let res = await this.em.find(target, opts)
             if (cacheEntities ?? this.cacheEntities) {
+                res = res.map((e) => this.cacheEntity(target, e) ?? e)
                 for (const e of res) {
-                    this.cacheEntity(target, e)
                     this.touchReturnedGraph(e)
                 }
             }
@@ -320,10 +320,10 @@ export class Store {
         return await this.performRead(async () => {
             const {cacheEntities, ...opts} = options
-            const res = await this.em.findOne(target, opts).then(noNull)
+            let res = await this.em.findOne(target, opts).then(noNull)
             if (cacheEntities ?? this.cacheEntities) {
                 const idOrEntity = res || getIdFromWhere(options.where)
-                this.cacheEntity(target, idOrEntity)
+                res = this.cacheEntity(target, idOrEntity) ?? res
                 if (res != null) {
                     this.touchReturnedGraph(res)
                 }
@@ -469,16 +469,48 @@ export class Store {
         assert(!this.isClosed, `too late to perform db updates, make sure you haven't forgot to await on db query`)
     }
-    private cacheEntity<E extends EntityLiteral>(target: EntityTarget<E>, entityOrId?: E | string) {
+    private cacheEntity<E extends EntityLiteral>(target: EntityTarget<E>, entityOrId?: E | string): E | undefined {
         if (entityOrId == null) return
         if (typeof entityOrId === 'string') {
             this.state.persist(target, entityOrId)
+            return
         } else {
-            this.traverseEntity(entityOrId, (e, md) => this.state.persist(md.target, e))
+            return this.persistReturnedGraph(entityOrId)
         }
     }
+    private persistReturnedGraph<E extends EntityLiteral>(entity: E): E {
+        const metadata = this.getEntityMetadata(entity.constructor)
+        for (const relation of metadata.relations) {
+            const inverseEntity = relation.getEntityValue(entity)
+            if (inverseEntity === undefined) continue
+            if (inverseEntity === null) {
+                continue
+            } else if (relation.isOneToMany || relation.isManyToMany) {
+                relation.setEntityValue(
+                    entity,
+                    inverseEntity.map((ie: EntityLiteral) => this.persistReturnedGraph(ie))
+                )
+            } else {
+                relation.setEntityValue(entity, this.persistReturnedGraph(inverseEntity))
+            }
+        }
+        const canonical = this.state.persist(metadata.target, entity) as E
+        if (canonical !== entity) {
+            for (const relation of metadata.relations) {
+                const inverseEntity = relation.getEntityValue(entity)
+                if (inverseEntity === undefined) continue
+                if (relation.getEntityValue(canonical) !== undefined) continue
+                relation.setEntityValue(canonical, inverseEntity)
+            }
+        }
+        return canonical
+    }
     private touchReturnedGraph(entity: EntityLiteral | null | undefined): void {
         this.traverseEntity(entity, (e) => this.state.touchEntity(e))
     }

package/src/utils/cacheMap.ts CHANGED Viewed

@@ -20,6 +20,12 @@ export function isSnapshotDirty(metadata: EntityMetadata, entity: EntityLiteral,
     return false
 }
+function copyColumnValues(metadata: EntityMetadata, from: EntityLiteral, to: EntityLiteral): void {
+    for (const col of metadata.nonVirtualColumns) {
+        col.setEntityValue(to, col.getEntityValue(from))
+    }
+}
 export class CachedEntity<E extends EntityLiteral = EntityLiteral> {
     value: E | null = null
     loadedFromDb = false
@@ -76,18 +82,19 @@ export class CacheMap {
      *
      * `fromQuery` — the entity came from a TypeORM query. If no instance is cached yet,
      * stores it and captures a baseline snapshot for dirty detection. If a different
-     * instance is already cached, the cached one is kept (it may be a reference already
-     * handed back to user code in a concurrent read); the baseline is only refreshed
-     * when that cached instance is still clean (no in-memory mutations vs. its baseline).
-     * This avoids silently dropping mutations made through one reference when a parallel
-     * `find()` re-loads the same row through a JOIN and traverses it through `persist`.
+     * instance is already cached, the cached one remains canonical (it may be a reference
+     * already handed back to user code in a concurrent read) and is returned to the caller.
+     * Clean cached instances are refreshed from the query row; dirty cached instances keep
+     * their in-memory mutations. This avoids silently dropping mutations made through one
+     * reference when a parallel `find()` re-loads the same row through a JOIN and traverses
+     * it through `persist`.
      *
      * `overwrite` — the caller explicitly requested upsert semantics (`replace: true`);
      * replaces any existing instance without touching `loadedFromDb` / `baseline`.
      *
      * Without either flag, a *different* object for an already-cached id throws.
      */
-    add<E extends EntityLiteral>(metadata: EntityMetadata, entity: E, opts?: {fromQuery?: boolean; overwrite?: boolean}): void {
+    add<E extends EntityLiteral>(metadata: EntityMetadata, entity: E, opts?: {fromQuery?: boolean; overwrite?: boolean}): E {
         const cacheMap = this.getEntityCache(metadata)
         let cached = cacheMap.get(entity.id)
@@ -103,36 +110,34 @@ export class CacheMap {
                 cached.baseline = captureColumnSnapshot(metadata, entity)
             }
             this.logger?.debug(`added entity ${metadata.name} ${entity.id}`)
-            return
+            return entity
         }
-        if (cached.value === entity) return
+        if (cached.value === entity) return entity
         if (opts?.fromQuery) {
-            // Preserve the canonical cached instance: a concurrent reader may already
-            // hold a reference to it and be about to mutate it. Replacing it here would
-            // silently drop those mutations and reset the baseline to the freshly-loaded
-            // (untouched) row, so dirty-detection at sync time would miss the change.
+            // Preserve the canonical cached instance: a concurrent reader may already hold
+            // a reference to it and be about to mutate it. Replacing it here would silently
+            // drop those mutations. Return the canonical instance so query callers mutate a
+            // tracked object even when TypeORM loaded a fresh duplicate for the same row.
             const cachedValue = cached.value
             const cachedClean =
                 cached.loadedFromDb &&
                 cached.baseline != null &&
                 !isSnapshotDirty(metadata, cachedValue, cached.baseline)
             if (cachedClean || !cached.loadedFromDb) {
-                // Cached instance has no pending in-memory mutations (or has never been
-                // associated with a DB baseline at all). Safe to align baseline to the
-                // latest DB read so future dirty detection works against fresh data.
+                copyColumnValues(metadata, entity, cachedValue)
                 cached.baseline = captureColumnSnapshot(metadata, cachedValue)
             }
             cached.loadedFromDb = true
             this.logger?.debug(`refreshed entity from query ${metadata.name} ${entity.id}`)
-            return
+            return cachedValue as E
         }
         if (opts?.overwrite) {
             cached.value = entity
             this.logger?.debug(`replaced entity (overwrite) ${metadata.name} ${entity.id}`)
-            return
+            return entity
         }
         throw new Error(

package/src/utils/stateManager.ts CHANGED Viewed

@@ -162,13 +162,15 @@ export class StateManager {
         }
     }
-    persist(target: EntityTarget<any>, entity: EntityLiteral | string) {
+    persist(target: EntityTarget<any>, id: string): void
+    persist<E extends EntityLiteral>(target: EntityTarget<any>, entity: E): E
+    persist<E extends EntityLiteral>(target: EntityTarget<any>, entity: E | string): E | void {
         const metadata = this.connection.getMetadata(target)
         if (typeof entity === 'string') {
             this.cacheMap.settle(metadata, entity)
         } else {
             this.getChanges(metadata).delete(entity.id)
-            this.cacheMap.add(metadata, entity, {fromQuery: true})
+            return this.cacheMap.add(metadata, entity, {fromQuery: true}) as E
         }
     }