joist-orm 1.114.1 → 1.115.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/build/src/AliasAssigner.d.ts +6 -0
- package/build/src/AliasAssigner.d.ts.map +1 -0
- package/build/src/AliasAssigner.js +18 -0
- package/build/src/AliasAssigner.js.map +1 -0
- package/build/src/EntityManager.d.ts +17 -3
- package/build/src/EntityManager.d.ts.map +1 -1
- package/build/src/EntityManager.js +57 -74
- package/build/src/EntityManager.js.map +1 -1
- package/build/src/HintTree.d.ts +38 -0
- package/build/src/HintTree.d.ts.map +1 -0
- package/build/src/HintTree.js +47 -0
- package/build/src/HintTree.js.map +1 -0
- package/build/src/JoinRows.d.ts +2 -0
- package/build/src/JoinRows.d.ts.map +1 -1
- package/build/src/JoinRows.js +12 -0
- package/build/src/JoinRows.js.map +1 -1
- package/build/src/QueryParser.d.ts +11 -0
- package/build/src/QueryParser.d.ts.map +1 -1
- package/build/src/QueryParser.js +9 -1
- package/build/src/QueryParser.js.map +1 -1
- package/build/src/ReactionsManager.d.ts +24 -0
- package/build/src/ReactionsManager.d.ts.map +1 -1
- package/build/src/ReactionsManager.js +58 -11
- package/build/src/ReactionsManager.js.map +1 -1
- package/build/src/dataloaders/loadDataLoader.d.ts +5 -1
- package/build/src/dataloaders/loadDataLoader.d.ts.map +1 -1
- package/build/src/dataloaders/loadDataLoader.js +30 -21
- package/build/src/dataloaders/loadDataLoader.js.map +1 -1
- package/build/src/dataloaders/populateDataLoader.d.ts +12 -0
- package/build/src/dataloaders/populateDataLoader.d.ts.map +1 -0
- package/build/src/dataloaders/populateDataLoader.js +107 -0
- package/build/src/dataloaders/populateDataLoader.js.map +1 -0
- package/build/src/drivers/buildKnexQuery.d.ts.map +1 -1
- package/build/src/drivers/buildKnexQuery.js +3 -0
- package/build/src/drivers/buildKnexQuery.js.map +1 -1
- package/build/src/index.d.ts +16 -10
- package/build/src/index.d.ts.map +1 -1
- package/build/src/index.js +23 -8
- package/build/src/index.js.map +1 -1
- package/build/src/keywords.d.ts +1 -0
- package/build/src/keywords.d.ts.map +1 -1
- package/build/src/keywords.js +6 -1
- package/build/src/keywords.js.map +1 -1
- package/build/src/normalizeHints.d.ts +2 -0
- package/build/src/normalizeHints.d.ts.map +1 -1
- package/build/src/normalizeHints.js +14 -1
- package/build/src/normalizeHints.js.map +1 -1
- package/build/src/plugins/PreloadPlugin.d.ts +46 -0
- package/build/src/plugins/PreloadPlugin.d.ts.map +1 -0
- package/build/src/plugins/PreloadPlugin.js +3 -0
- package/build/src/plugins/PreloadPlugin.js.map +1 -0
- package/build/src/relations/CustomCollection.d.ts.map +1 -1
- package/build/src/relations/CustomCollection.js.map +1 -1
- package/build/src/relations/CustomReference.d.ts.map +1 -1
- package/build/src/relations/CustomReference.js.map +1 -1
- package/build/src/relations/ManyToManyCollection.d.ts +3 -0
- package/build/src/relations/ManyToManyCollection.d.ts.map +1 -1
- package/build/src/relations/ManyToManyCollection.js +15 -7
- package/build/src/relations/ManyToManyCollection.js.map +1 -1
- package/build/src/relations/ManyToOneReference.d.ts +3 -1
- package/build/src/relations/ManyToOneReference.d.ts.map +1 -1
- package/build/src/relations/ManyToOneReference.js +35 -8
- package/build/src/relations/ManyToOneReference.js.map +1 -1
- package/build/src/relations/OneToManyCollection.d.ts +3 -0
- package/build/src/relations/OneToManyCollection.d.ts.map +1 -1
- package/build/src/relations/OneToManyCollection.js +41 -15
- package/build/src/relations/OneToManyCollection.js.map +1 -1
- package/build/src/relations/OneToOneReference.d.ts +3 -0
- package/build/src/relations/OneToOneReference.d.ts.map +1 -1
- package/build/src/relations/OneToOneReference.js +17 -2
- package/build/src/relations/OneToOneReference.js.map +1 -1
- package/build/src/relations/hasPersistedAsyncProperty.d.ts.map +1 -1
- package/build/src/relations/hasPersistedAsyncProperty.js +1 -4
- package/build/src/relations/hasPersistedAsyncProperty.js.map +1 -1
- package/build/src/serde.d.ts +14 -0
- package/build/src/serde.d.ts.map +1 -1
- package/build/src/serde.js +38 -0
- package/build/src/serde.js.map +1 -1
- package/build/src/utils.d.ts +5 -2
- package/build/src/utils.d.ts.map +1 -1
- package/build/src/utils.js +16 -1
- package/build/src/utils.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomReference.js","sourceRoot":"","sources":["../../../src/relations/CustomReference.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"CustomReference.js","sourceRoot":"","sources":["../../../src/relations/CustomReference.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,8 @@ export declare class ManyToManyCollection<T extends Entity, U extends Entity> ex
|
|
|
25
25
|
add(other: U, percolated?: boolean): void;
|
|
26
26
|
remove(other: U, percolated?: boolean): void;
|
|
27
27
|
get isLoaded(): boolean;
|
|
28
|
+
get isPreloaded(): boolean;
|
|
29
|
+
preload(): void;
|
|
28
30
|
private doGet;
|
|
29
31
|
get getWithDeleted(): U[];
|
|
30
32
|
get get(): U[];
|
|
@@ -43,6 +45,7 @@ export declare class ManyToManyCollection<T extends Entity, U extends Entity> ex
|
|
|
43
45
|
get otherMeta(): EntityMetadata<U>;
|
|
44
46
|
private get isCascadeDelete();
|
|
45
47
|
toString(): string;
|
|
48
|
+
private getPreloaded;
|
|
46
49
|
[RelationT]: T;
|
|
47
50
|
[RelationU]: U;
|
|
48
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToManyCollection.d.ts","sourceRoot":"","sources":["../../../src/relations/ManyToManyCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGV,MAAM,EACN,cAAc,EAGd,IAAI,EAEL,MAAM,KAAK,CAAC;AAIb,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,sDAAsD;AACtD,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAC9D,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,EAC3B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,EAC5B,cAAc,EAAE,MAAM,CAAC,GAAG,MAAM,EAChC,eAAe,EAAE,MAAM,GACtB,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAWlB;AAED,qBAAa,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAClE,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAChC,YAAW,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;;IASlB,aAAa,EAAE,MAAM;IAOrB,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM;IAC3B,UAAU,EAAE,MAAM;IAElB,cAAc,EAAE,MAAM,CAAC,GAAG,MAAM;IAChC,eAAe,EAAE,MAAM;IAhBhC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,iBAAiB,CAAkB;IAC3C,OAAO,CAAC,mBAAmB,CAAkB;gBAGpC,aAAa,EAAE,MAAM,EAM5B,MAAM,EAAE,CAAC,EACF,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,EAC3B,UAAU,EAAE,MAAM,EACzB,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,EACrB,cAAc,EAAE,MAAM,CAAC,GAAG,MAAM,EAChC,eAAe,EAAE,MAAM;IAOhC,yFAAyF;IACzF,OAAO,CAAC,aAAa;IAMf,IAAI,CAAC,IAAI,GAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAU5F,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAgBzC,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB1C,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,UAAU,UAAQ,GAAG,IAAI;IAiBvC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,UAAU,UAAQ,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"ManyToManyCollection.d.ts","sourceRoot":"","sources":["../../../src/relations/ManyToManyCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
50
50
|
(0, __1.ensureNotDeleted)(this.#entity, "pending");
|
|
51
51
|
if (this.loaded === undefined || (opts.forceReload && !this.#entity.isNewEntity)) {
|
|
52
52
|
const key = `${this.columnName}=${this.#entity.id}`;
|
|
53
|
-
this.loaded = await (0, manyToManyDataLoader_1.manyToManyDataLoader)(this.#entity.em, this).load(key);
|
|
53
|
+
this.loaded = this.getPreloaded() ?? (await (0, manyToManyDataLoader_1.manyToManyDataLoader)(this.#entity.em, this).load(key));
|
|
54
54
|
this.maybeApplyAddedAndRemovedBeforeLoaded();
|
|
55
55
|
}
|
|
56
56
|
return this.filterDeleted(this.loaded, opts);
|
|
@@ -116,17 +116,20 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
116
116
|
(0, utils_1.remove)(this.loaded, other);
|
|
117
117
|
}
|
|
118
118
|
else {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
}
|
|
122
|
-
if (!(this.removedBeforeLoaded ??= []).includes(other)) {
|
|
123
|
-
this.removedBeforeLoaded.push(other);
|
|
124
|
-
}
|
|
119
|
+
(0, utils_1.maybeRemove)(this.addedBeforeLoaded, other);
|
|
120
|
+
(0, utils_1.maybeAdd)((this.removedBeforeLoaded ??= []), other);
|
|
125
121
|
}
|
|
126
122
|
}
|
|
127
123
|
get isLoaded() {
|
|
128
124
|
return this.loaded !== undefined;
|
|
129
125
|
}
|
|
126
|
+
get isPreloaded() {
|
|
127
|
+
return !!this.getPreloaded();
|
|
128
|
+
}
|
|
129
|
+
preload() {
|
|
130
|
+
this.loaded = this.getPreloaded();
|
|
131
|
+
this.maybeApplyAddedAndRemovedBeforeLoaded();
|
|
132
|
+
}
|
|
130
133
|
doGet() {
|
|
131
134
|
(0, __1.ensureNotDeleted)(this.#entity);
|
|
132
135
|
if (this.loaded === undefined) {
|
|
@@ -224,6 +227,11 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
224
227
|
toString() {
|
|
225
228
|
return `OneToManyCollection(entity: ${this.#entity}, fieldName: ${this.fieldName}, otherType: ${this.otherMeta.type}, otherFieldName: ${this.otherFieldName})`;
|
|
226
229
|
}
|
|
230
|
+
getPreloaded() {
|
|
231
|
+
if (this.#entity.isNewEntity)
|
|
232
|
+
return undefined;
|
|
233
|
+
return (0, __1.getEmInternalApi)(this.#entity.em).getPreloadedRelation(this.#entity.idTagged, this.fieldName);
|
|
234
|
+
}
|
|
227
235
|
[Relation_1.RelationT] = null;
|
|
228
236
|
[Relation_1.RelationU] = null;
|
|
229
237
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToManyCollection.js","sourceRoot":"","sources":["../../../src/relations/ManyToManyCollection.ts"],"names":[],"mappings":";;;AAAA,2BAUa;AACb,8EAA2E;AAC3E,sFAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"ManyToManyCollection.js","sourceRoot":"","sources":["../../../src/relations/ManyToManyCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,8 @@ export declare class ManyToOneReferenceImpl<T extends Entity, U extends Entity,
|
|
|
46
46
|
set(other: U | N): void;
|
|
47
47
|
get isSet(): boolean;
|
|
48
48
|
get isLoaded(): boolean;
|
|
49
|
+
get isPreloaded(): boolean;
|
|
50
|
+
preload(): void;
|
|
49
51
|
private doGet;
|
|
50
52
|
get getWithDeleted(): U | N;
|
|
51
53
|
get get(): U | N;
|
|
@@ -65,7 +67,7 @@ export declare class ManyToOneReferenceImpl<T extends Entity, U extends Entity,
|
|
|
65
67
|
initializeForNewEntity(): void;
|
|
66
68
|
maybeCascadeDelete(): void;
|
|
67
69
|
cleanupOnEntityDeleted(): Promise<void>;
|
|
68
|
-
maybeRemove(other: U | undefined): void;
|
|
70
|
+
maybeRemove(otherId: string | undefined, other: U | undefined): void;
|
|
69
71
|
maybeAdd(): void;
|
|
70
72
|
current(opts?: {
|
|
71
73
|
withDeleted?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToOneReference.d.ts","sourceRoot":"","sources":["../../../src/relations/ManyToOneReference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,IAAI,EAA8D,MAAM,kBAAkB,CAAC;AACpG,OAAO,EAAE,cAAc,EAA+B,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAIL,SAAS,EASV,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"ManyToOneReference.d.ts","sourceRoot":"","sources":["../../../src/relations/ManyToOneReference.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const Entity_1 = require("../Entity");
|
|
|
5
5
|
const EntityManager_1 = require("../EntityManager");
|
|
6
6
|
const EntityMetadata_1 = require("../EntityMetadata");
|
|
7
7
|
const index_1 = require("../index");
|
|
8
|
+
const utils_1 = require("../utils");
|
|
8
9
|
const AbstractRelationImpl_1 = require("./AbstractRelationImpl");
|
|
9
10
|
const OneToManyCollection_1 = require("./OneToManyCollection");
|
|
10
11
|
const Reference_1 = require("./Reference");
|
|
@@ -72,6 +73,13 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
72
73
|
get isLoaded() {
|
|
73
74
|
return this._isLoaded;
|
|
74
75
|
}
|
|
76
|
+
get isPreloaded() {
|
|
77
|
+
return !!this.maybeFindEntity();
|
|
78
|
+
}
|
|
79
|
+
preload() {
|
|
80
|
+
this.loaded = this.maybeFindEntity();
|
|
81
|
+
this._isLoaded = true;
|
|
82
|
+
}
|
|
75
83
|
doGet(opts) {
|
|
76
84
|
(0, index_1.ensureNotDeleted)(this.#entity, "pending");
|
|
77
85
|
// This should only be callable in the type system if we've already resolved this to an instance,
|
|
@@ -102,6 +110,7 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
102
110
|
if (id && !(0, index_1.isTaggedId)(id)) {
|
|
103
111
|
id = (0, index_1.tagId)(this.otherMeta, id);
|
|
104
112
|
}
|
|
113
|
+
const previousId = this.idTagged;
|
|
105
114
|
const previous = this.maybeFindEntity();
|
|
106
115
|
const changed = (0, index_1.setField)(this.#entity, this.fieldName, id);
|
|
107
116
|
if (!changed) {
|
|
@@ -109,7 +118,7 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
109
118
|
}
|
|
110
119
|
this.loaded = id ? this.#entity.em.getEntity(id) : undefined;
|
|
111
120
|
this._isLoaded = !!this.loaded;
|
|
112
|
-
this.maybeRemove(previous);
|
|
121
|
+
this.maybeRemove(previousId, previous);
|
|
113
122
|
this.maybeAdd();
|
|
114
123
|
}
|
|
115
124
|
get idIfSet() {
|
|
@@ -148,6 +157,7 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
148
157
|
if ((0, EntityManager_1.sameEntity)(other, this.current({ withDeleted: true }))) {
|
|
149
158
|
return;
|
|
150
159
|
}
|
|
160
|
+
const previousId = this.idTagged;
|
|
151
161
|
const previous = this.maybeFindEntity();
|
|
152
162
|
// Prefer to keep the id in our data hash, but if this is a new entity w/o an id, use the entity itself
|
|
153
163
|
(0, index_1.setField)(this.#entity, this.fieldName, (0, Entity_1.isEntity)(other) ? other?.idTaggedMaybe ?? other : other);
|
|
@@ -159,7 +169,7 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
159
169
|
this.loaded = other;
|
|
160
170
|
this._isLoaded = true;
|
|
161
171
|
}
|
|
162
|
-
this.maybeRemove(previous);
|
|
172
|
+
this.maybeRemove(previousId, previous);
|
|
163
173
|
this.maybeAdd();
|
|
164
174
|
}
|
|
165
175
|
// private impl
|
|
@@ -205,7 +215,7 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
205
215
|
this.loaded = undefined;
|
|
206
216
|
this._isLoaded = true;
|
|
207
217
|
}
|
|
208
|
-
maybeRemove(other) {
|
|
218
|
+
maybeRemove(otherId, other) {
|
|
209
219
|
if (other) {
|
|
210
220
|
const prevRelation = this.getOtherRelation(other);
|
|
211
221
|
if (prevRelation instanceof OneToManyCollection_1.OneToManyCollection) {
|
|
@@ -218,6 +228,22 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
218
228
|
prevRelation.set(undefined, { percolating: true });
|
|
219
229
|
}
|
|
220
230
|
}
|
|
231
|
+
else if (otherId) {
|
|
232
|
+
// Other is not loaded in memory, but cache it in case our other side is later loaded
|
|
233
|
+
const { em } = this.#entity;
|
|
234
|
+
let map = (0, EntityManager_1.getEmInternalApi)(em).pendingChildren.get(otherId);
|
|
235
|
+
if (!map) {
|
|
236
|
+
map = new Map();
|
|
237
|
+
(0, EntityManager_1.getEmInternalApi)(em).pendingChildren.set(otherId, map);
|
|
238
|
+
}
|
|
239
|
+
let pending = map.get(this.otherFieldName);
|
|
240
|
+
if (!pending) {
|
|
241
|
+
pending = { adds: [], removes: [] };
|
|
242
|
+
map.set(this.otherFieldName, pending);
|
|
243
|
+
}
|
|
244
|
+
(0, utils_1.maybeAdd)(pending.removes, this.#entity);
|
|
245
|
+
(0, utils_1.maybeRemove)(pending.adds, this.#entity);
|
|
246
|
+
}
|
|
221
247
|
}
|
|
222
248
|
maybeAdd() {
|
|
223
249
|
const id = this.current();
|
|
@@ -243,12 +269,13 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
243
269
|
map = new Map();
|
|
244
270
|
(0, EntityManager_1.getEmInternalApi)(em).pendingChildren.set(id, map);
|
|
245
271
|
}
|
|
246
|
-
let
|
|
247
|
-
if (!
|
|
248
|
-
|
|
249
|
-
map.set(this.otherFieldName,
|
|
272
|
+
let pending = map.get(this.otherFieldName);
|
|
273
|
+
if (!pending) {
|
|
274
|
+
pending = { adds: [], removes: [] };
|
|
275
|
+
map.set(this.otherFieldName, pending);
|
|
250
276
|
}
|
|
251
|
-
|
|
277
|
+
(0, utils_1.maybeAdd)(pending.adds, this.#entity);
|
|
278
|
+
(0, utils_1.maybeRemove)(pending.removes, this.#entity);
|
|
252
279
|
}
|
|
253
280
|
}
|
|
254
281
|
// We need to keep U in data[fieldName] to handle entities without an id assigned yet.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToOneReference.js","sourceRoot":"","sources":["../../../src/relations/ManyToOneReference.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ManyToOneReference.js","sourceRoot":"","sources":["../../../src/relations/ManyToOneReference.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,8 @@ export declare class OneToManyCollection<T extends Entity, U extends Entity> ext
|
|
|
23
23
|
find(id: IdOf<U>): Promise<U | undefined>;
|
|
24
24
|
includes(other: U): Promise<boolean>;
|
|
25
25
|
get isLoaded(): boolean;
|
|
26
|
+
get isPreloaded(): boolean;
|
|
27
|
+
preload(): void;
|
|
26
28
|
get get(): U[];
|
|
27
29
|
get getWithDeleted(): U[];
|
|
28
30
|
private doGet;
|
|
@@ -50,6 +52,7 @@ export declare class OneToManyCollection<T extends Entity, U extends Entity> ext
|
|
|
50
52
|
/** Returns the other relation that points back at us, i.e. we're `Author.image` and this is `Image.author_id`. */
|
|
51
53
|
private getOtherRelation;
|
|
52
54
|
private get isCascadeDelete();
|
|
55
|
+
private getPreloaded;
|
|
53
56
|
[RelationT]: T;
|
|
54
57
|
[RelationU]: U;
|
|
55
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneToManyCollection.d.ts","sourceRoot":"","sources":["../../../src/relations/OneToManyCollection.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EAGV,MAAM,EACN,cAAc,EAGd,IAAI,EAGJ,OAAO,EAER,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,oDAAoD;AACpD,wBAAgB,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EACxD,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,EAC5B,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,EAC3B,cAAc,EAAE,MAAM,CAAC,GAAG,MAAM,EAChC,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,GAC1D,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAGlB;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CACjE,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAChC,YAAW,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;;
|
|
1
|
+
{"version":3,"file":"OneToManyCollection.d.ts","sourceRoot":"","sources":["../../../src/relations/OneToManyCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,11 +21,13 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
21
21
|
#fieldName;
|
|
22
22
|
#orderBy;
|
|
23
23
|
loaded;
|
|
24
|
-
// We
|
|
24
|
+
// We _used_ to not track removedBeforeLoaded, because if a child is removed in our unloaded state,
|
|
25
25
|
// when we load and get back the `child X has parent_id = our id` rows from the db, `loaderForCollection`
|
|
26
26
|
// groups the hydrated rows by their _current parent m2o field value_, which for a removed child will no
|
|
27
27
|
// longer be us, so it will effectively not show up in our post-load `loaded` array.
|
|
28
|
+
// However, now with join preloading, the getPreloadedRelation might still have pre-load removed children.
|
|
28
29
|
#addedBeforeLoaded;
|
|
30
|
+
#removedBeforeLoaded;
|
|
29
31
|
constructor(
|
|
30
32
|
// These are public to our internal implementation but not exposed in the Collection API
|
|
31
33
|
entity, otherMeta, fieldName, otherFieldName, otherColumnName, orderBy) {
|
|
@@ -41,7 +43,8 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
41
43
|
async load(opts = {}) {
|
|
42
44
|
(0, index_1.ensureNotDeleted)(this.#entity, "pending");
|
|
43
45
|
if (this.loaded === undefined || (opts.forceReload && !this.#entity.isNewEntity)) {
|
|
44
|
-
this.loaded =
|
|
46
|
+
this.loaded =
|
|
47
|
+
this.getPreloaded() ?? (await (0, oneToManyDataLoader_1.oneToManyDataLoader)(this.#entity.em, this).load(this.#entity.idTagged));
|
|
45
48
|
this.maybeAppendAddedBeforeLoaded();
|
|
46
49
|
}
|
|
47
50
|
return this.filterDeleted(this.loaded, opts);
|
|
@@ -67,6 +70,13 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
67
70
|
get isLoaded() {
|
|
68
71
|
return this.loaded !== undefined;
|
|
69
72
|
}
|
|
73
|
+
get isPreloaded() {
|
|
74
|
+
return !!this.getPreloaded();
|
|
75
|
+
}
|
|
76
|
+
preload() {
|
|
77
|
+
this.loaded = this.getPreloaded();
|
|
78
|
+
this.maybeAppendAddedBeforeLoaded();
|
|
79
|
+
}
|
|
70
80
|
get get() {
|
|
71
81
|
return this.filterDeleted(this.doGet(), { withDeleted: false });
|
|
72
82
|
}
|
|
@@ -77,7 +87,7 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
77
87
|
(0, index_1.ensureNotDeleted)(this.#entity, "pending");
|
|
78
88
|
if (this.loaded === undefined) {
|
|
79
89
|
// This should only be callable in the type system if we've already resolved this to an instance
|
|
80
|
-
throw new Error("get was called when not
|
|
90
|
+
throw new Error("get was called when not loaded");
|
|
81
91
|
}
|
|
82
92
|
return this.loaded;
|
|
83
93
|
}
|
|
@@ -111,14 +121,12 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
111
121
|
add(other) {
|
|
112
122
|
(0, index_1.ensureNotDeleted)(this.#entity);
|
|
113
123
|
if (this.loaded === undefined) {
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
124
|
+
this.#addedBeforeLoaded ??= [];
|
|
125
|
+
(0, utils_1.maybeAdd)(this.#addedBeforeLoaded, other);
|
|
126
|
+
(0, utils_1.maybeRemove)(this.#removedBeforeLoaded, other);
|
|
117
127
|
}
|
|
118
128
|
else {
|
|
119
|
-
|
|
120
|
-
this.loaded.push(other);
|
|
121
|
-
}
|
|
129
|
+
(0, utils_1.maybeAdd)(this.loaded, other);
|
|
122
130
|
}
|
|
123
131
|
// This will no-op and mark other dirty if necessary
|
|
124
132
|
this.getOtherRelation(other).set(this.#entity);
|
|
@@ -130,7 +138,14 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
130
138
|
if (this.loaded === undefined && opts.requireLoaded) {
|
|
131
139
|
throw new Error("remove was called when not loaded");
|
|
132
140
|
}
|
|
133
|
-
|
|
141
|
+
if (this.loaded === undefined) {
|
|
142
|
+
this.#removedBeforeLoaded ??= [];
|
|
143
|
+
(0, utils_1.maybeAdd)(this.#removedBeforeLoaded, other);
|
|
144
|
+
(0, utils_1.maybeRemove)(this.#addedBeforeLoaded, other);
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
(0, utils_1.remove)(this.loaded, other);
|
|
148
|
+
}
|
|
134
149
|
// This will no-op and mark other dirty if necessary
|
|
135
150
|
this.getOtherRelation(other).set(undefined);
|
|
136
151
|
}
|
|
@@ -193,18 +208,24 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
193
208
|
// be handled here?)
|
|
194
209
|
if (!this.#entity.isNewEntity) {
|
|
195
210
|
const { em } = this.#entity;
|
|
196
|
-
const
|
|
197
|
-
if (
|
|
198
|
-
(this.#addedBeforeLoaded ??= []).push(...
|
|
199
|
-
|
|
211
|
+
const pending = (0, index_1.getEmInternalApi)(em).pendingChildren.get(this.#entity.idTagged)?.get(this.fieldName);
|
|
212
|
+
if (pending) {
|
|
213
|
+
(this.#addedBeforeLoaded ??= []).push(...pending.adds);
|
|
214
|
+
(this.#removedBeforeLoaded ??= []).push(...pending.removes);
|
|
215
|
+
(0, utils_1.clear)(pending.adds);
|
|
216
|
+
(0, utils_1.clear)(pending.removes);
|
|
200
217
|
}
|
|
201
218
|
}
|
|
202
219
|
if (this.#addedBeforeLoaded) {
|
|
203
220
|
const newEntities = this.#addedBeforeLoaded.filter((e) => !this.loaded?.includes(e));
|
|
204
221
|
// Push on the end to better match the db order of "newer things come last"
|
|
205
222
|
this.loaded.push(...newEntities);
|
|
223
|
+
this.#addedBeforeLoaded = undefined;
|
|
224
|
+
}
|
|
225
|
+
if (this.#removedBeforeLoaded) {
|
|
226
|
+
this.#removedBeforeLoaded.forEach((e) => (0, utils_1.remove)(this.loaded, e));
|
|
227
|
+
this.#removedBeforeLoaded = undefined;
|
|
206
228
|
}
|
|
207
|
-
this.#addedBeforeLoaded = [];
|
|
208
229
|
}
|
|
209
230
|
current(opts) {
|
|
210
231
|
return this.filterDeleted(this.loaded ?? this.#addedBeforeLoaded ?? [], opts);
|
|
@@ -239,6 +260,11 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
239
260
|
get isCascadeDelete() {
|
|
240
261
|
return (0, index_1.getMetadata)(this.#entity).config.__data.cascadeDeleteFields.includes(this.#fieldName);
|
|
241
262
|
}
|
|
263
|
+
getPreloaded() {
|
|
264
|
+
if (this.#entity.isNewEntity)
|
|
265
|
+
return undefined;
|
|
266
|
+
return (0, index_1.getEmInternalApi)(this.#entity.em).getPreloadedRelation(this.#entity.idTagged, this.fieldName);
|
|
267
|
+
}
|
|
242
268
|
[Relation_1.RelationT] = null;
|
|
243
269
|
[Relation_1.RelationU] = null;
|
|
244
270
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneToManyCollection.js","sourceRoot":"","sources":["../../../src/relations/OneToManyCollection.ts"],"names":[],"mappings":";;;AAAA,4EAAyE;AACzE,oFAAiF;AACjF,oCAakB;AAClB,
|
|
1
|
+
{"version":3,"file":"OneToManyCollection.js","sourceRoot":"","sources":["../../../src/relations/OneToManyCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,6 +68,8 @@ export declare class OneToOneReferenceImpl<T extends Entity, U extends Entity> e
|
|
|
68
68
|
percolating?: boolean;
|
|
69
69
|
}): void;
|
|
70
70
|
get isLoaded(): boolean;
|
|
71
|
+
get isPreloaded(): boolean;
|
|
72
|
+
preload(): void;
|
|
71
73
|
get getWithDeleted(): U | undefined;
|
|
72
74
|
get entity(): T;
|
|
73
75
|
get get(): U | undefined;
|
|
@@ -81,6 +83,7 @@ export declare class OneToOneReferenceImpl<T extends Entity, U extends Entity> e
|
|
|
81
83
|
private filterDeleted;
|
|
82
84
|
/** Returns the other relation that points back at us, i.e. we're `Author.image` and this is `Image.author_id`. */
|
|
83
85
|
private getOtherRelation;
|
|
86
|
+
private getPreloaded;
|
|
84
87
|
[RelationT]: never;
|
|
85
88
|
[RelationU]: never;
|
|
86
89
|
[ReferenceN]: never;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneToOneReference.d.ts","sourceRoot":"","sources":["../../../src/relations/OneToOneReference.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"OneToOneReference.d.ts","sourceRoot":"","sources":["../../../src/relations/OneToOneReference.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,7 +100,10 @@ class OneToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
100
100
|
(0, __1.ensureNotDeleted)(this.#entity, "pending");
|
|
101
101
|
if (!this._isLoaded || opts.forceReload) {
|
|
102
102
|
if (!this.#entity.isNewEntity) {
|
|
103
|
-
|
|
103
|
+
const joinLoaded = this.getPreloaded();
|
|
104
|
+
this.loaded = joinLoaded
|
|
105
|
+
? joinLoaded[0]
|
|
106
|
+
: await (0, oneToOneDataLoader_1.oneToOneDataLoader)(this.#entity.em, this).load(this.#entity.idTagged);
|
|
104
107
|
}
|
|
105
108
|
this._isLoaded = true;
|
|
106
109
|
}
|
|
@@ -126,6 +129,13 @@ class OneToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
126
129
|
get isLoaded() {
|
|
127
130
|
return this._isLoaded;
|
|
128
131
|
}
|
|
132
|
+
get isPreloaded() {
|
|
133
|
+
return !!this.getPreloaded();
|
|
134
|
+
}
|
|
135
|
+
preload() {
|
|
136
|
+
this.loaded = this.getPreloaded()?.[0];
|
|
137
|
+
this._isLoaded = true;
|
|
138
|
+
}
|
|
129
139
|
get getWithDeleted() {
|
|
130
140
|
return this.filterDeleted(this.doGet(), { withDeleted: true });
|
|
131
141
|
}
|
|
@@ -142,7 +152,7 @@ class OneToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
142
152
|
(0, __1.ensureNotDeleted)(this.#entity, "pending");
|
|
143
153
|
if (!this._isLoaded) {
|
|
144
154
|
// This should only be callable in the type system if we've already resolved this to an instance
|
|
145
|
-
throw new Error("get was called when not
|
|
155
|
+
throw new Error("get was called when not loaded");
|
|
146
156
|
}
|
|
147
157
|
return this.loaded;
|
|
148
158
|
}
|
|
@@ -180,6 +190,11 @@ class OneToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
180
190
|
getOtherRelation(other) {
|
|
181
191
|
return other[this.otherFieldName];
|
|
182
192
|
}
|
|
193
|
+
getPreloaded() {
|
|
194
|
+
if (this.#entity.isNewEntity)
|
|
195
|
+
return undefined;
|
|
196
|
+
return (0, __1.getEmInternalApi)(this.#entity.em).getPreloadedRelation(this.#entity.idTagged, this.fieldName);
|
|
197
|
+
}
|
|
183
198
|
[Relation_1.RelationT] = null;
|
|
184
199
|
[Relation_1.RelationU] = null;
|
|
185
200
|
[Reference_1.ReferenceN] = null;
|