joist-orm 1.129.3 → 1.129.4
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/build/ReactionsManager.d.ts +3 -3
- package/build/ReactionsManager.d.ts.map +1 -1
- package/build/ReactionsManager.js +5 -4
- package/build/ReactionsManager.js.map +1 -1
- package/build/relations/OneToManyCollection.d.ts.map +1 -1
- package/build/relations/OneToManyCollection.js +17 -5
- package/build/relations/OneToManyCollection.js.map +1 -1
- package/build/relations/PersistedAsyncProperty.d.ts +0 -2
- package/build/relations/PersistedAsyncProperty.d.ts.map +1 -1
- package/build/relations/PersistedAsyncProperty.js +15 -8
- package/build/relations/PersistedAsyncProperty.js.map +1 -1
- package/build/relations/PersistedAsyncReference.d.ts.map +1 -1
- package/build/relations/PersistedAsyncReference.js +20 -4
- package/build/relations/PersistedAsyncReference.js.map +1 -1
- package/package.json +2 -2
|
@@ -39,12 +39,12 @@ export declare class ReactionsManager {
|
|
|
39
39
|
/**
|
|
40
40
|
* Returns whether this field might be pending recalc.
|
|
41
41
|
*
|
|
42
|
-
* This is technically a guess, b/c our reaction infra may not yet have crawled
|
|
42
|
+
* This is technically a guess, b/c our reaction infra may not yet have crawled from an upstream
|
|
43
43
|
* source field down to the `N` specific target entities that need recalced, and instead just
|
|
44
44
|
* knows "it will need to do that soon" i.e. at the next `em.flush`.
|
|
45
45
|
*
|
|
46
|
-
* So, instead this is a heuristic that
|
|
47
|
-
* entities
|
|
46
|
+
* So, instead this is a heuristic that reports if `fieldName` has been marked dirty for _some_
|
|
47
|
+
* entities of type `entity`, but we don't technically know if that's _this_ entity.
|
|
48
48
|
*
|
|
49
49
|
* I.e. this might return false positives, but should never return false negatives.
|
|
50
50
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactionsManager.d.ts","sourceRoot":"","sources":["../src/ReactionsManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B,oFAAoF;IACpF,OAAO,CAAC,qBAAqB,CAA2E;IACxG;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW,CAAuC;IAC1D;;;OAGG;IACH,OAAO,CAAC,2BAA2B,CAAsC;IAEzE;;;;;;OAMG;IACH,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAmBtE,wEAAwE;IACxE,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IA0BxE,gGAAgG;IAChG,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAQ9C;;;;;;;;;;;OAWG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAIhE;;;;;;OAMG;IACG,0BAA0B;
|
|
1
|
+
{"version":3,"file":"ReactionsManager.d.ts","sourceRoot":"","sources":["../src/ReactionsManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B,oFAAoF;IACpF,OAAO,CAAC,qBAAqB,CAA2E;IACxG;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW,CAAuC;IAC1D;;;OAGG;IACH,OAAO,CAAC,2BAA2B,CAAsC;IAEzE;;;;;;OAMG;IACH,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAmBtE,wEAAwE;IACxE,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IA0BxE,gGAAgG;IAChG,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAQ9C;;;;;;;;;;;OAWG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAIhE;;;;;;OAMG;IACG,0BAA0B;IAmDhC,+EAA+E;IAC/E,KAAK,IAAI,IAAI;IAIb,IAAI,2BAA2B,IAAI,OAAO,CAEzC;IAEK,iCAAiC,IAAI,OAAO,CAAC,IAAI,CAAC;IAQxD,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,cAAc;CAQvB"}
|
|
@@ -93,12 +93,12 @@ class ReactionsManager {
|
|
|
93
93
|
/**
|
|
94
94
|
* Returns whether this field might be pending recalc.
|
|
95
95
|
*
|
|
96
|
-
* This is technically a guess, b/c our reaction infra may not yet have crawled
|
|
96
|
+
* This is technically a guess, b/c our reaction infra may not yet have crawled from an upstream
|
|
97
97
|
* source field down to the `N` specific target entities that need recalced, and instead just
|
|
98
98
|
* knows "it will need to do that soon" i.e. at the next `em.flush`.
|
|
99
99
|
*
|
|
100
|
-
* So, instead this is a heuristic that
|
|
101
|
-
* entities
|
|
100
|
+
* So, instead this is a heuristic that reports if `fieldName` has been marked dirty for _some_
|
|
101
|
+
* entities of type `entity`, but we don't technically know if that's _this_ entity.
|
|
102
102
|
*
|
|
103
103
|
* I.e. this might return false positives, but should never return false negatives.
|
|
104
104
|
*/
|
|
@@ -137,7 +137,8 @@ class ReactionsManager {
|
|
|
137
137
|
// Multiple reactions could have pointed back to the same reactive field, so
|
|
138
138
|
// dedupe the found relations before calling .load.
|
|
139
139
|
const unique = [...new Set(relations.flat())];
|
|
140
|
-
// Use allSettled so that we can watch for derived values that want to use the entity'd id
|
|
140
|
+
// Use allSettled so that we can watch for derived values that want to use the entity'd id,
|
|
141
|
+
// i.e. they can fail but we'll queue them from later.
|
|
141
142
|
const results = await Promise.allSettled(unique.map((r) => r.load()));
|
|
142
143
|
const failures = [];
|
|
143
144
|
results.forEach((result, i) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactionsManager.js","sourceRoot":"","sources":["../src/ReactionsManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ReactionsManager.js","sourceRoot":"","sources":["../src/ReactionsManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneToManyCollection.d.ts","sourceRoot":"","sources":["../../src/relations/OneToManyCollection.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,
|
|
1
|
+
{"version":3,"file":"OneToManyCollection.d.ts","sourceRoot":"","sources":["../../src/relations/OneToManyCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OneToManyCollection = exports.hasMany = void 0;
|
|
4
|
-
const Entity_1 = require("../Entity");
|
|
5
4
|
const oneToManyDataLoader_1 = require("../dataloaders/oneToManyDataLoader");
|
|
6
5
|
const oneToManyFindDataLoader_1 = require("../dataloaders/oneToManyFindDataLoader");
|
|
6
|
+
const Entity_1 = require("../Entity");
|
|
7
7
|
const index_1 = require("../index");
|
|
8
8
|
const utils_1 = require("../utils");
|
|
9
9
|
const AbstractRelationImpl_1 = require("./AbstractRelationImpl");
|
|
@@ -44,8 +44,18 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
44
44
|
async load(opts = {}) {
|
|
45
45
|
(0, index_1.ensureNotDeleted)(this.entity, "pending");
|
|
46
46
|
if (this.loaded === undefined || (opts.forceReload && !this.entity.isNewEntity)) {
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
// If forceReload=true, the `.load` might return a cached array, which one would think is stale
|
|
48
|
+
// (i.e. it doesn't have our WIP adds & removes applied to it), _but_ because we've been mutating
|
|
49
|
+
// our `this.loaded`, really `.load` is a noop, and just gives us back the same list we had before.
|
|
50
|
+
//
|
|
51
|
+
// ...although if we'd:
|
|
52
|
+
// a) created an array in the DL cache
|
|
53
|
+
// b) em.flushed & reset the dataloaders
|
|
54
|
+
// c) make WIP changes to our existing array
|
|
55
|
+
// d) called `forceReload: true`
|
|
56
|
+
// e) we'll ask the dataloader for a new array, and will be missing our WIP changes
|
|
57
|
+
const dl = (0, oneToManyDataLoader_1.oneToManyDataLoader)(this.entity.em, this);
|
|
58
|
+
this.loaded = this.getPreloaded() ?? (await dl.load(this.entity.idTagged));
|
|
49
59
|
this.maybeAppendAddedBeforeLoaded();
|
|
50
60
|
}
|
|
51
61
|
return this.filterDeleted(this.loaded, opts);
|
|
@@ -168,8 +178,10 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
168
178
|
if (this.loaded !== undefined) {
|
|
169
179
|
(0, utils_1.remove)(this.loaded, other);
|
|
170
180
|
}
|
|
171
|
-
else
|
|
172
|
-
|
|
181
|
+
else {
|
|
182
|
+
this.#removedBeforeLoaded ??= [];
|
|
183
|
+
(0, utils_1.maybeRemove)(this.#addedBeforeLoaded, other);
|
|
184
|
+
(0, utils_1.maybeAdd)(this.#removedBeforeLoaded, other);
|
|
173
185
|
}
|
|
174
186
|
}
|
|
175
187
|
maybeCascadeDelete() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneToManyCollection.js","sourceRoot":"","sources":["../../src/relations/OneToManyCollection.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"OneToManyCollection.js","sourceRoot":"","sources":["../../src/relations/OneToManyCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,8 +63,6 @@ export declare class PersistedAsyncPropertyImpl<T extends Entity, H extends Reac
|
|
|
63
63
|
fieldName: keyof T & string;
|
|
64
64
|
reactiveHint: H;
|
|
65
65
|
private fn;
|
|
66
|
-
private loaded;
|
|
67
|
-
private loadPromise;
|
|
68
66
|
constructor(entity: T, fieldName: keyof T & string, reactiveHint: H, fn: (entity: Reacted<T, H>) => V);
|
|
69
67
|
load(opts?: {
|
|
70
68
|
forceReload?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PersistedAsyncProperty.d.ts","sourceRoot":"","sources":["../../src/relations/PersistedAsyncProperty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAInC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC;IACzD,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IAEf;;;;;;;;;;;;;;;OAeG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAEnD,yGAAyG;IACzG,GAAG,EAAE,CAAC,CAAC;IAEP;;;;;;SAMK;IACL,UAAU,EAAE,CAAC,CAAC;CACf;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,CAAC,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,EAC5F,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,EAC3B,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAC/B,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAG9B;AAED,qBAAa,0BAA0B,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CACpF,SAAQ,oBAAoB,CAAC,CAAC,CAC9B,YAAW,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC;;IAO9B,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM;IAC3B,YAAY,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"PersistedAsyncProperty.d.ts","sourceRoot":"","sources":["../../src/relations/PersistedAsyncProperty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAInC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC;IACzD,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IAEf;;;;;;;;;;;;;;;OAeG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAEnD,yGAAyG;IACzG,GAAG,EAAE,CAAC,CAAC;IAEP;;;;;;SAMK;IACL,UAAU,EAAE,CAAC,CAAC;CACf;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,CAAC,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,EAC5F,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,EAC3B,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAC/B,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAG9B;AAED,qBAAa,0BAA0B,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CACpF,SAAQ,oBAAoB,CAAC,CAAC,CAC9B,YAAW,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC;;IAO9B,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM;IAC3B,YAAY,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE;gBAHV,MAAM,EAAE,CAAC,EACF,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,EAC3B,YAAY,EAAE,CAAC,EACd,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC;IAO1C,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAYlD,iHAAiH;IACjH,IAAI,GAAG,IAAI,CAAC,CAmBX;IAED,IAAI,UAAU,IAAI,CAAC,CAElB;IAED,IAAI,KAAK,YAER;IAED,IAAI,QAAQ,YAMX;IAED,IAAI,QAAQ,IAAI,GAAG,CAElB;IAED,CAAC,cAAc,CAAC,IAAyB;CAC1C;AAED,iFAAiF;AACjF,wBAAgB,wBAAwB,CACtC,kBAAkB,EAAE,GAAG,GACtB,kBAAkB,IAAI,sBAAsB,CAAC,GAAG,EAAE,GAAG,CAAC,CAExD;AAED,uFAAuF;AACvF,wBAAgB,qBAAqB,CAAC,kBAAkB,EAAE,GAAG,GAAG,kBAAkB,IAAI,sBAAsB,CAAC,GAAG,EAAE,GAAG,CAAC,CAErH"}
|
|
@@ -25,20 +25,21 @@ class PersistedAsyncPropertyImpl extends AbstractPropertyImpl_1.AbstractProperty
|
|
|
25
25
|
reactiveHint;
|
|
26
26
|
fn;
|
|
27
27
|
#reactiveHint;
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
#loadPromise;
|
|
29
|
+
#loaded;
|
|
30
30
|
constructor(entity, fieldName, reactiveHint, fn) {
|
|
31
31
|
super(entity);
|
|
32
32
|
this.fieldName = fieldName;
|
|
33
33
|
this.reactiveHint = reactiveHint;
|
|
34
34
|
this.fn = fn;
|
|
35
35
|
this.#reactiveHint = reactiveHint;
|
|
36
|
+
this.#loaded = false;
|
|
36
37
|
}
|
|
37
38
|
load(opts) {
|
|
38
|
-
if (!this.
|
|
39
|
-
return (this
|
|
40
|
-
this
|
|
41
|
-
this
|
|
39
|
+
if (!this.isLoaded || opts?.forceReload) {
|
|
40
|
+
return (this.#loadPromise ??= this.entity.em.populate(this.entity, { hint: this.loadHint }).then(() => {
|
|
41
|
+
this.#loadPromise = undefined;
|
|
42
|
+
this.#loaded = true;
|
|
42
43
|
// Go through `this.get` so that `setField` is called to set our latest value
|
|
43
44
|
return this.get;
|
|
44
45
|
}));
|
|
@@ -48,7 +49,9 @@ class PersistedAsyncPropertyImpl extends AbstractPropertyImpl_1.AbstractProperty
|
|
|
48
49
|
/** Returns either the latest calculated value (if loaded) or the previously-calculated value (if not loaded). */
|
|
49
50
|
get get() {
|
|
50
51
|
const { fn } = this;
|
|
51
|
-
|
|
52
|
+
// Check #loaded to make sure we don't revert to stale values if our subgraph has been changed since
|
|
53
|
+
// the last `.load()`. It's better to fail and tell the user.
|
|
54
|
+
if (this.#loaded || this.isLoaded) {
|
|
52
55
|
const newValue = fn(this.entity);
|
|
53
56
|
// It's cheap to set this every time we're called, i.e. even if it's not the
|
|
54
57
|
// official "being called during em.flush" update (...unless we're accessing it
|
|
@@ -73,7 +76,11 @@ class PersistedAsyncPropertyImpl extends AbstractPropertyImpl_1.AbstractProperty
|
|
|
73
76
|
return this.fieldName in this.entity.__orm.data;
|
|
74
77
|
}
|
|
75
78
|
get isLoaded() {
|
|
76
|
-
|
|
79
|
+
const hintLoaded = (0, index_1.isLoaded)(this.entity, this.loadHint);
|
|
80
|
+
if (hintLoaded) {
|
|
81
|
+
this.#loaded = true;
|
|
82
|
+
}
|
|
83
|
+
return hintLoaded;
|
|
77
84
|
}
|
|
78
85
|
get loadHint() {
|
|
79
86
|
return (0, EntityMetadata_1.getMetadata)(this.entity).config.__data.cachedReactiveLoadHints[this.fieldName];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PersistedAsyncProperty.js","sourceRoot":"","sources":["../../src/relations/PersistedAsyncProperty.ts"],"names":[],"mappings":";;;AACA,oDAAkF;AAClF,sDAAgD;AAChD,oCAA8C;AAE9C,oCAAsC;AACtC,iEAA8D;AAC9D,yDAAoD;AAmDpD;;;;;;;GAOG;AACH,SAAgB,yBAAyB,CACvC,SAA2B,EAC3B,IAAO,EACP,EAAgC;IAEhC,MAAM,MAAM,GAAG,4CAAiC,CAAC;IACjD,OAAO,IAAI,0BAA0B,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;AACrE,CAAC;AAPD,8DAOC;AAED,MAAa,0BACX,SAAQ,2CAAuB;IAQtB;IACA;IACC;IAPD,aAAa,CAAI;
|
|
1
|
+
{"version":3,"file":"PersistedAsyncProperty.js","sourceRoot":"","sources":["../../src/relations/PersistedAsyncProperty.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PersistedAsyncReference.d.ts","sourceRoot":"","sources":["../../src/relations/PersistedAsyncReference.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,QAAQ,EAaT,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,IAAI,EAAgC,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,KAAK,GAAG,SAAS,CACtG,SAAQ,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IAEf,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAE3E;;;;;;SAMK;IACL,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC;IAElB,oJAAoJ;IACpJ,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAEZ,oHAAoH;IACpH,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAE7B,UAAU,EAAE,MAAM,CAAC;IAEnB,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC;AAED,wBAAgB,0BAA0B,CACxC,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,EAChB,KAAK,CAAC,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EAC/B,CAAC,SAAS,KAAK,GAAG,SAAS,EAE3B,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,EAC5B,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,EAC3B,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GACnC,uBAAuB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAGlC;AAED,qBAAa,2BAA2B,CACpC,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EACzB,CAAC,SAAS,KAAK,GAAG,SAAS,CAE7B,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,CACjC,YAAW,uBAAuB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;IAYzC,OAAO,CAAC,SAAS;IAEV,YAAY,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE;IATZ,OAAO,CAAC,MAAM,CAAqB;IAEnC,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,WAAW,CAAM;gBAEvB,MAAM,EAAE,CAAC,EACD,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,EACnC,SAAS,EAAE,cAAc,EAClB,YAAY,EAAE,CAAC,EACd,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;IAaxC,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,IAAI,CAAC;QAAC,WAAW,CAAC,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"PersistedAsyncReference.d.ts","sourceRoot":"","sources":["../../src/relations/PersistedAsyncReference.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,9 +41,11 @@ class PersistedAsyncReferenceImpl extends AbstractRelationImpl_1.AbstractRelatio
|
|
|
41
41
|
async load(opts) {
|
|
42
42
|
(0, __1.ensureNotDeleted)(this.entity, "pending");
|
|
43
43
|
const { loadHint } = this;
|
|
44
|
-
if (!this.
|
|
44
|
+
if (!this.isLoaded || opts?.forceReload) {
|
|
45
45
|
const { em } = this.entity;
|
|
46
|
-
//
|
|
46
|
+
// Just because we're not loaded, doesn't mean we necessarily need to load our full
|
|
47
|
+
// hint. Ideally we only need to load our previously-calculated/persisted value, and
|
|
48
|
+
// only load the full load hint if we need recalculated.
|
|
47
49
|
const recalc = opts?.forceReload || (0, __1.getEmInternalApi)(em).rm.isMaybePendingRecalc(this.entity, this.fieldName);
|
|
48
50
|
if (recalc) {
|
|
49
51
|
return (this.loadPromise ??= em.populate(this.entity, { hint: loadHint, ...opts }).then(() => {
|
|
@@ -76,7 +78,8 @@ class PersistedAsyncReferenceImpl extends AbstractRelationImpl_1.AbstractRelatio
|
|
|
76
78
|
doGet(opts) {
|
|
77
79
|
const { fn } = this;
|
|
78
80
|
(0, __1.ensureNotDeleted)(this.entity, "pending");
|
|
79
|
-
|
|
81
|
+
// We assume `isLoaded` has been called coming into this to manage
|
|
82
|
+
if (this._isLoaded === "full") {
|
|
80
83
|
const newValue = this.filterDeleted(fn(this.entity), opts);
|
|
81
84
|
// It's cheap to set this every time we're called, i.e. even if it's not the
|
|
82
85
|
// official "being called during em.flush" update (...unless we're accessing it
|
|
@@ -104,7 +107,20 @@ class PersistedAsyncReferenceImpl extends AbstractRelationImpl_1.AbstractRelatio
|
|
|
104
107
|
return this.doGet({ withDeleted: false });
|
|
105
108
|
}
|
|
106
109
|
get isLoaded() {
|
|
107
|
-
|
|
110
|
+
const maybeDirty = (0, __1.getEmInternalApi)(this.entity.em).rm.isMaybePendingRecalc(this.entity, this.fieldName);
|
|
111
|
+
// If we might be dirty, it doesn't matter what our last _isLoaded value was, we need to
|
|
112
|
+
// check if our tree is loaded, b/c it might have recently been mutated.
|
|
113
|
+
if (maybeDirty) {
|
|
114
|
+
const hintLoaded = (0, __1.isLoaded)(this.entity, this.loadHint);
|
|
115
|
+
if (hintLoaded) {
|
|
116
|
+
this._isLoaded = "full";
|
|
117
|
+
}
|
|
118
|
+
return hintLoaded;
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
// If we're not dirty, then either being "full" or "ref" loaded is fine
|
|
122
|
+
return !!this._isLoaded;
|
|
123
|
+
}
|
|
108
124
|
}
|
|
109
125
|
set(other) {
|
|
110
126
|
(0, __1.fail)("Cannot set a persisted async relation directly.");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PersistedAsyncReference.js","sourceRoot":"","sources":["../../src/relations/PersistedAsyncReference.ts"],"names":[],"mappings":";;;AAAA,0BAgBY;AAEZ,oDAAsE;AAEtE,iEAA8D;AAC9D,6DAAiE;AACjE,2CAAoD;AACpD,yCAAkD;AA6BlD,SAAgB,0BAA0B,CAMxC,SAA4B,EAC5B,SAA2B,EAC3B,IAAO,EACP,EAAoC;IAEpC,MAAM,MAAM,GAAG,4CAAiC,CAAC;IACjD,OAAO,IAAI,2BAA2B,CAAa,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;AAC7F,CAAC;AAbD,gEAaC;AAED,MAAa,2BAMX,SAAQ,2CAA0B;IAaxB;IAED;IACC;IAbD,UAAU,CAAmB;IAC7B,UAAU,CAAiB;IAC3B,aAAa,CAAI;IAC1B,uEAAuE;IAC/D,MAAM,CAAqB;IACnC,qGAAqG;IAC7F,SAAS,GAA2B,KAAK,CAAC;IAC1C,WAAW,CAAM;IACzB,YACE,MAAS,EACD,SAA2B,EACnC,SAAyB,EAClB,YAAe,EACd,EAAoC;QAE5C,KAAK,CAAC,MAAM,CAAC,CAAC;QALN,cAAS,GAAT,SAAS,CAAkB;QAE5B,iBAAY,GAAZ,YAAY,CAAG;QACd,OAAE,GAAF,EAAE,CAAkC;QAG5C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,+FAA+F;QAC/F,2FAA2F;QAC3F,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,IAAI,CAAC,SAAS,GAAG,IAAA,YAAQ,EAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;SAC3D;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAiD;QAC1D,IAAA,oBAAgB,EAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACzC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"PersistedAsyncReference.js","sourceRoot":"","sources":["../../src/relations/PersistedAsyncReference.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "joist-orm",
|
|
3
|
-
"version": "1.129.
|
|
3
|
+
"version": "1.129.4",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@types/object-hash": "^3.0.5",
|
|
23
23
|
"dataloader": "^2.2.2",
|
|
24
|
-
"joist-utils": "1.129.
|
|
24
|
+
"joist-utils": "1.129.4",
|
|
25
25
|
"knex": "^3.0.1",
|
|
26
26
|
"object-hash": "^3.0.0",
|
|
27
27
|
"pg": "^8.11.3"
|