joist-orm 1.176.1 → 1.178.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/dataloaders/recursiveChildrenDataLoader.d.ts.map +1 -1
- package/build/dataloaders/recursiveChildrenDataLoader.js +1 -1
- package/build/dataloaders/recursiveChildrenDataLoader.js.map +1 -1
- package/build/relations/RecursiveCollection.d.ts +1 -0
- package/build/relations/RecursiveCollection.d.ts.map +1 -1
- package/build/relations/RecursiveCollection.js +11 -1
- package/build/relations/RecursiveCollection.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recursiveChildrenDataLoader.d.ts","sourceRoot":"","sources":["../../src/dataloaders/recursiveChildrenDataLoader.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,aAAa,EAAoB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"recursiveChildrenDataLoader.d.ts","sourceRoot":"","sources":["../../src/dataloaders/recursiveChildrenDataLoader.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,aAAa,EAAoB,MAAM,kBAAkB,CAAC;AAenE,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AAGnF,wBAAgB,2BAA2B,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAC5E,EAAE,EAAE,aAAa,EACjB,UAAU,EAAE,+BAA+B,CAAC,CAAC,EAAE,CAAC,CAAC,GAChD,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CA+DzB"}
|
|
@@ -52,7 +52,7 @@ function recursiveChildrenDataLoader(em, collection) {
|
|
|
52
52
|
}
|
|
53
53
|
// Any entity[o2m] still not loaded must be a leaf which didn't have any children; go ahead and mark it as loaded
|
|
54
54
|
for (const entity of [...parents, ...entities]) {
|
|
55
|
-
if (!(0, index_1.isLoadedCollection)(entity[o2m.fieldName])) {
|
|
55
|
+
if (!(0, index_1.isLoadedCollection)(entity[o2m.fieldName]) && !(0, index_1.isLoadedOneToOneReference)(entity[o2m.fieldName])) {
|
|
56
56
|
(0, EntityManager_1.getEmInternalApi)(em).setPreloadedRelation(entity.id, o2m.fieldName, []);
|
|
57
57
|
entity[o2m.fieldName].preload();
|
|
58
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recursiveChildrenDataLoader.js","sourceRoot":"","sources":["../../src/dataloaders/recursiveChildrenDataLoader.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"recursiveChildrenDataLoader.js","sourceRoot":"","sources":["../../src/dataloaders/recursiveChildrenDataLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,6 +66,7 @@ export declare class RecursiveChildrenCollectionImpl<T extends Entity, U extends
|
|
|
66
66
|
get o2mFieldName(): string;
|
|
67
67
|
toString(): string;
|
|
68
68
|
doGet(): U[];
|
|
69
|
+
/** Finds any children/downstream o2m collections or o2o references. */
|
|
69
70
|
private findUnloadedCollections;
|
|
70
71
|
}
|
|
71
72
|
export declare class RecursiveCycleError extends Error {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveCollection.d.ts","sourceRoot":"","sources":["../../src/relations/RecursiveCollection.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"RecursiveCollection.d.ts","sourceRoot":"","sources":["../../src/relations/RecursiveCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -193,6 +193,7 @@ class RecursiveChildrenCollectionImpl extends AbstractRecursiveCollectionImpl {
|
|
|
193
193
|
}
|
|
194
194
|
return children;
|
|
195
195
|
}
|
|
196
|
+
/** Finds any children/downstream o2m collections or o2o references. */
|
|
196
197
|
findUnloadedCollections() {
|
|
197
198
|
const visited = new Set();
|
|
198
199
|
const unloaded = [];
|
|
@@ -205,6 +206,9 @@ class RecursiveChildrenCollectionImpl extends AbstractRecursiveCollectionImpl {
|
|
|
205
206
|
if ((0, index_1.isCollection)(relation) && !(0, index_1.isLoadedCollection)(relation)) {
|
|
206
207
|
unloaded.push(relation);
|
|
207
208
|
}
|
|
209
|
+
else if ((0, index_1.isOneToOneReference)(relation) && !(0, index_1.isLoadedOneToOneReference)(relation)) {
|
|
210
|
+
unloaded.push(relation);
|
|
211
|
+
}
|
|
208
212
|
else {
|
|
209
213
|
for (const child of getLoadedCollection(relation)) {
|
|
210
214
|
todo.push({ relation: child[this.#o2mName], path: [...path, child] });
|
|
@@ -219,7 +223,13 @@ function getLoadedReference(relation) {
|
|
|
219
223
|
return (0, index_1.isLoadedReference)(relation) ? relation.get : (0, index_1.fail)(`${relation} was not loaded`);
|
|
220
224
|
}
|
|
221
225
|
function getLoadedCollection(relation) {
|
|
222
|
-
return (0, index_1.isLoadedCollection)(relation)
|
|
226
|
+
return (0, index_1.isLoadedCollection)(relation)
|
|
227
|
+
? relation.get
|
|
228
|
+
: (0, index_1.isLoadedOneToOneReference)(relation)
|
|
229
|
+
? relation.get
|
|
230
|
+
? [relation.get]
|
|
231
|
+
: []
|
|
232
|
+
: (0, index_1.fail)(`${relation} was not loaded`);
|
|
223
233
|
}
|
|
224
234
|
class RecursiveCycleError extends Error {
|
|
225
235
|
entities = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveCollection.js","sourceRoot":"","sources":["../../src/relations/RecursiveCollection.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"RecursiveCollection.js","sourceRoot":"","sources":["../../src/relations/RecursiveCollection.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.
|
|
3
|
+
"version": "1.178.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"@types/object-hash": "^3.0.6",
|
|
23
23
|
"ansis": "^3.2.0",
|
|
24
24
|
"dataloader": "^2.2.2",
|
|
25
|
-
"joist-utils": "1.
|
|
25
|
+
"joist-utils": "1.178.0",
|
|
26
26
|
"knex": "^3.1.0",
|
|
27
27
|
"object-hash": "^3.0.0",
|
|
28
28
|
"pg": "^8.12.0",
|