joist-orm 1.143.0 → 1.143.2
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.map +1 -1
- package/build/ReactionsManager.js +6 -1
- package/build/ReactionsManager.js.map +1 -1
- package/build/reactiveHints.d.ts.map +1 -1
- package/build/reactiveHints.js +17 -8
- package/build/reactiveHints.js.map +1 -1
- package/build/relations/ManyToManyCollection.d.ts +0 -3
- package/build/relations/ManyToManyCollection.d.ts.map +1 -1
- package/build/relations/ManyToManyCollection.js +47 -42
- package/build/relations/ManyToManyCollection.js.map +1 -1
- package/package.json +2 -2
|
@@ -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;
|
|
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;IAqBtE,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;IAsDhC,+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"}
|
|
@@ -52,6 +52,8 @@ class ReactionsManager {
|
|
|
52
52
|
// dirty, otherwise it will be left out of any INSERTs/UPDATEs.
|
|
53
53
|
this.getPending(rf).todo.add(entity);
|
|
54
54
|
this.getDirtyFields((0, EntityMetadata_1.getMetadata)(rf.cstr)).add(rf.name);
|
|
55
|
+
// Keep for future debugging...
|
|
56
|
+
// console.log(`${entity}.${fieldName} changed, queuing ${rf.name} walk from ${entity} -> ${rf.path}`);
|
|
55
57
|
}
|
|
56
58
|
}
|
|
57
59
|
}
|
|
@@ -129,10 +131,13 @@ class ReactionsManager {
|
|
|
129
131
|
for (const doing of todo)
|
|
130
132
|
pending.done.add(doing);
|
|
131
133
|
// Walk back from the source to any downstream fields
|
|
132
|
-
|
|
134
|
+
const relations = (await (0, reactiveHints_1.followReverseHint)(todo, rf.path))
|
|
133
135
|
.filter((entity) => !entity.isDeletedEntity)
|
|
134
136
|
.filter((e) => e instanceof rf.cstr)
|
|
135
137
|
.map((entity) => entity[rf.name]);
|
|
138
|
+
// Keep for future debugging...
|
|
139
|
+
// console.log(`Recalc-ing ${todo} -> ${rf.path} -> ${rf.cstr.name}.${rf.name} for found ${relations.length}`);
|
|
140
|
+
return relations;
|
|
136
141
|
}));
|
|
137
142
|
// Multiple reactions could have pointed back to the same reactive field, so
|
|
138
143
|
// dedupe the found relations before calling .load.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactionsManager.js","sourceRoot":"","sources":["../src/ReactionsManager.ts"],"names":[],"mappings":";;;AACA,qDAAoF;AAEpF,mCAAoC;AACpC,mDAAoD;AAEpD,2EAAwE;AAExE;;;;;;GAMG;AACH,MAAa,gBAAgB;IAC3B,oFAAoF;IAC5E,qBAAqB,GAAiE,IAAI,GAAG,EAAE,CAAC;IACxG;;;;;;;;OAQG;IACK,WAAW,GAA6B,IAAI,GAAG,EAAE,CAAC;IAC1D;;;OAGG;IACK,2BAA2B,GAA4B,IAAI,GAAG,EAAE,CAAC;IAEzE;;;;;;OAMG;IACH,6BAA6B,CAAC,MAAc,EAAE,SAAiB;QAC7D,yEAAyE;QACzE,MAAM,GAAG,GAAG,IAAA,oCAAmB,EAAC,IAAA,4BAAW,EAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC3G,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,IAAI,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBAClC,uFAAuF;gBACvF,uCAAuC;gBACvC,mEAAmE;gBACnE,mFAAmF;gBACnF,yEAAyE;gBACzE,4EAA4E;gBAC5E,2EAA2E;gBAC3E,iEAAiE;gBACjE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACrC,IAAI,CAAC,cAAc,CAAC,IAAA,4BAAW,EAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ReactionsManager.js","sourceRoot":"","sources":["../src/ReactionsManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reactiveHints.d.ts","sourceRoot":"","sources":["../src/reactiveHints.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reactiveHints.d.ts","sourceRoot":"","sources":["../src/reactiveHints.ts"],"names":[],"mappings":"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"}
|
package/build/reactiveHints.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertToLoadHint = exports.followReverseHint = exports.reverseReactiveHint = void 0;
|
|
4
|
-
const fields_1 = require("./fields");
|
|
5
4
|
const EntityManager_1 = require("./EntityManager");
|
|
6
5
|
const EntityMetadata_1 = require("./EntityMetadata");
|
|
6
|
+
const fields_1 = require("./fields");
|
|
7
7
|
const getProperties_1 = require("./getProperties");
|
|
8
8
|
const normalizeHints_1 = require("./normalizeHints");
|
|
9
9
|
const hasAsyncProperty_1 = require("./relations/hasAsyncProperty");
|
|
@@ -43,21 +43,30 @@ function reverseReactiveHint(rootType, entityType, hint, reactForOtherSide, isFi
|
|
|
43
43
|
return { entity, fields, path: [...path, field.otherFieldName] };
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
|
-
case "m2m":
|
|
46
|
+
case "m2m": {
|
|
47
|
+
const otherFieldName = field.otherMetadata().allFields[field.otherFieldName].kind === "poly"
|
|
48
|
+
? `${field.otherFieldName}@${meta.type}`
|
|
49
|
+
: field.otherFieldName;
|
|
50
|
+
// While o2m and o2o can watch for just FK changes by passing `reactForOtherSide` (the FK lives in the other
|
|
51
|
+
// table), for m2m reactivity we push the collection name into the reactive hint, because it's effectively
|
|
52
|
+
// "the other/reverse side", and JoinRows will trigger it explicitly instead of `setField` for non-m2m keys.
|
|
53
|
+
fields.push(field.fieldName);
|
|
54
|
+
return reverseReactiveHint(rootType, field.otherMetadata().cstr, subHint,
|
|
55
|
+
// For m2m, we can always pass undefined here, as otherwise having the opposite m2m collection
|
|
56
|
+
// recalc all of its children will cause over-reactivity
|
|
57
|
+
undefined, false).map(({ entity, fields, path }) => {
|
|
58
|
+
return { entity, fields, path: [...path, otherFieldName] };
|
|
59
|
+
});
|
|
60
|
+
}
|
|
47
61
|
case "o2m":
|
|
48
62
|
case "o2o": {
|
|
49
63
|
const isOtherReadOnly = field.otherMetadata().allFields[field.otherFieldName].immutable;
|
|
50
64
|
const otherFieldName = field.otherMetadata().allFields[field.otherFieldName].kind === "poly"
|
|
51
65
|
? `${field.otherFieldName}@${meta.type}`
|
|
52
66
|
: field.otherFieldName;
|
|
53
|
-
// While o2m and o2o can watch for just FK changes, for m2m reactivity we push the
|
|
54
|
-
// collection name into the reactive hint as well, for JoinRows to trigger.
|
|
55
|
-
if (field.kind === "m2m") {
|
|
56
|
-
fields.push(field.fieldName);
|
|
57
|
-
}
|
|
58
67
|
// This is not a field, but we want our reverse side to be reactive, so pass reactForOtherSide
|
|
59
68
|
return reverseReactiveHint(rootType, field.otherMetadata().cstr, subHint,
|
|
60
|
-
// For o2m/o2o
|
|
69
|
+
// For o2m/o2o, isReadOnly will only be true if the hint is using a `:ro` / `_ro` suffix,
|
|
61
70
|
// in which case we really do want to be read-only. But if isOtherReadOnly is true, then we
|
|
62
71
|
// don't need to "react to the field changing" (which can't happen for immutable fields), but
|
|
63
72
|
// we do need to react to children being created/deleted.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reactiveHints.js","sourceRoot":"","sources":["../src/reactiveHints.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"reactiveHints.js","sourceRoot":"","sources":["../src/reactiveHints.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,9 +10,6 @@ export declare class ManyToManyCollection<T extends Entity, U extends Entity> ex
|
|
|
10
10
|
columnName: string;
|
|
11
11
|
otherFieldName: keyof U & string;
|
|
12
12
|
otherColumnName: string;
|
|
13
|
-
private loaded;
|
|
14
|
-
private addedBeforeLoaded;
|
|
15
|
-
private removedBeforeLoaded;
|
|
16
13
|
constructor(joinTableName: string, entity: T, fieldName: keyof T & string, columnName: string, otherMeta: EntityMetadata, otherFieldName: keyof U & string, otherColumnName: string);
|
|
17
14
|
/** Removes pending-hard-delete or soft-deleted entities, unless explicitly asked for. */
|
|
18
15
|
private filterDeleted;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToManyCollection.d.ts","sourceRoot":"","sources":["../../src/relations/ManyToManyCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,MAAM,EACN,cAAc,EAGd,IAAI,EAGL,MAAM,KAAK,CAAC;AAKb,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,MAAM,EAAE,CAAC,EACT,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,CAUlB;AAED,qBAAa,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAClE,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CACnC,YAAW,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;;IAQlB,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;
|
|
1
|
+
{"version":3,"file":"ManyToManyCollection.d.ts","sourceRoot":"","sources":["../../src/relations/ManyToManyCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,MAAM,EACN,cAAc,EAGd,IAAI,EAGL,MAAM,KAAK,CAAC;AAKb,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,MAAM,EAAE,CAAC,EACT,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,CAUlB;AAED,qBAAa,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAClE,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CACnC,YAAW,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;;IAQlB,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;gBAXvB,aAAa,EAAE,MAAM,EAM5B,MAAM,EAAE,CAAC,EACF,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,EAC3B,UAAU,EAAE,MAAM,EACzB,SAAS,EAAE,cAAc,EAClB,cAAc,EAAE,MAAM,CAAC,GAAG,MAAM,EAChC,eAAe,EAAE,MAAM;IAShC,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;IAiBzC,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;IAgB1C,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,OAAO,IAAI,IAAI;IAKf,OAAO,CAAC,KAAK;IASb,IAAI,cAAc,IAAI,CAAC,EAAE,CAExB;IAED,IAAI,GAAG,IAAI,CAAC,EAAE,CAEb;IAED,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI;IAiBtB,SAAS,IAAI,IAAI;IAYjB,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI;IAK9B,kBAAkB;IAMZ,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW7C,OAAO,CAAC,qCAAqC;IAiB7C,OAAO,CAAC,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,CAAC,EAAE;IAI9C,IAAW,IAAI,IAAI,cAAc,CAEhC;IAED,IAAW,SAAS,IAAI,cAAc,CAErC;IAED,OAAO,KAAK,eAAe,GAE1B;IAEM,QAAQ,IAAI,MAAM;IAIzB,OAAO,CAAC,YAAY;IAKpB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAS;IACvB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAS;CACxB"}
|
|
@@ -20,9 +20,9 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
20
20
|
otherFieldName;
|
|
21
21
|
otherColumnName;
|
|
22
22
|
#fieldName;
|
|
23
|
-
loaded;
|
|
24
|
-
addedBeforeLoaded;
|
|
25
|
-
removedBeforeLoaded;
|
|
23
|
+
#loaded;
|
|
24
|
+
#addedBeforeLoaded;
|
|
25
|
+
#removedBeforeLoaded;
|
|
26
26
|
constructor(joinTableName,
|
|
27
27
|
// I.e. when entity = Book:
|
|
28
28
|
// fieldName == tags, because it's our collection to tags
|
|
@@ -38,7 +38,7 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
38
38
|
this.otherColumnName = otherColumnName;
|
|
39
39
|
this.#fieldName = fieldName;
|
|
40
40
|
if ((0, Entity_1.isOrWasNew)(entity)) {
|
|
41
|
-
this
|
|
41
|
+
this.#loaded = [];
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
/** Removes pending-hard-delete or soft-deleted entities, unless explicitly asked for. */
|
|
@@ -49,20 +49,20 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
49
49
|
}
|
|
50
50
|
async load(opts = {}) {
|
|
51
51
|
(0, __1.ensureNotDeleted)(this.entity, "pending");
|
|
52
|
-
if (this
|
|
52
|
+
if (this.#loaded === undefined || (opts.forceReload && !this.entity.isNewEntity)) {
|
|
53
53
|
const key = `${this.columnName}=${this.entity.id}`;
|
|
54
|
-
this
|
|
54
|
+
this.#loaded = this.getPreloaded() ?? (await (0, manyToManyDataLoader_1.manyToManyDataLoader)(this.entity.em, this).load(key));
|
|
55
55
|
this.maybeApplyAddedAndRemovedBeforeLoaded();
|
|
56
56
|
}
|
|
57
|
-
return this.filterDeleted(this
|
|
57
|
+
return this.filterDeleted(this.#loaded, opts);
|
|
58
58
|
}
|
|
59
59
|
async find(id) {
|
|
60
60
|
(0, __1.ensureNotDeleted)(this.entity, "pending");
|
|
61
|
-
if (this
|
|
62
|
-
return this
|
|
61
|
+
if (this.#loaded !== undefined) {
|
|
62
|
+
return this.#loaded.find((u) => u.id === id);
|
|
63
63
|
}
|
|
64
64
|
else {
|
|
65
|
-
const added = this
|
|
65
|
+
const added = this.#addedBeforeLoaded?.find((u) => u.id === id);
|
|
66
66
|
if (added) {
|
|
67
67
|
return added;
|
|
68
68
|
}
|
|
@@ -75,11 +75,11 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
75
75
|
}
|
|
76
76
|
async includes(other) {
|
|
77
77
|
(0, __1.ensureNotDeleted)(this.entity, "pending");
|
|
78
|
-
if (this
|
|
79
|
-
return this
|
|
78
|
+
if (this.#loaded !== undefined) {
|
|
79
|
+
return this.#loaded.includes(other);
|
|
80
80
|
}
|
|
81
81
|
else {
|
|
82
|
-
if (this
|
|
82
|
+
if (this.#addedBeforeLoaded?.includes(other)) {
|
|
83
83
|
return true;
|
|
84
84
|
}
|
|
85
85
|
else if (other.isNewEntity) {
|
|
@@ -92,16 +92,16 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
92
92
|
}
|
|
93
93
|
add(other, percolated = false) {
|
|
94
94
|
(0, __1.ensureNotDeleted)(this.entity);
|
|
95
|
-
if (this
|
|
96
|
-
if (this
|
|
95
|
+
if (this.#loaded !== undefined) {
|
|
96
|
+
if (this.#loaded.includes(other))
|
|
97
97
|
return;
|
|
98
|
-
this
|
|
98
|
+
this.#loaded.push(other);
|
|
99
99
|
}
|
|
100
100
|
else {
|
|
101
|
-
if (this
|
|
102
|
-
(0, utils_1.remove)(this
|
|
103
|
-
if (!(this
|
|
104
|
-
this
|
|
101
|
+
if (this.#removedBeforeLoaded)
|
|
102
|
+
(0, utils_1.remove)(this.#removedBeforeLoaded, other);
|
|
103
|
+
if (!(this.#addedBeforeLoaded ??= []).includes(other))
|
|
104
|
+
this.#addedBeforeLoaded.push(other);
|
|
105
105
|
}
|
|
106
106
|
if (!percolated) {
|
|
107
107
|
(0, __1.getEmInternalApi)(this.entity.em).joinRows(this).addNew(this, this.entity, other);
|
|
@@ -114,31 +114,31 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
114
114
|
(0, __1.getEmInternalApi)(this.entity.em).joinRows(this).addRemove(this, this.entity, other);
|
|
115
115
|
other[this.otherFieldName].remove(this.entity, true);
|
|
116
116
|
}
|
|
117
|
-
if (this
|
|
118
|
-
(0, utils_1.remove)(this
|
|
117
|
+
if (this.#loaded !== undefined) {
|
|
118
|
+
(0, utils_1.remove)(this.#loaded, other);
|
|
119
119
|
}
|
|
120
120
|
else {
|
|
121
|
-
(0, utils_1.maybeRemove)(this
|
|
122
|
-
(0, utils_1.maybeAdd)((this
|
|
121
|
+
(0, utils_1.maybeRemove)(this.#addedBeforeLoaded, other);
|
|
122
|
+
(0, utils_1.maybeAdd)((this.#removedBeforeLoaded ??= []), other);
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
125
|
get isLoaded() {
|
|
126
|
-
return this
|
|
126
|
+
return this.#loaded !== undefined;
|
|
127
127
|
}
|
|
128
128
|
get isPreloaded() {
|
|
129
129
|
return !!this.getPreloaded();
|
|
130
130
|
}
|
|
131
131
|
preload() {
|
|
132
|
-
this
|
|
132
|
+
this.#loaded = this.getPreloaded();
|
|
133
133
|
this.maybeApplyAddedAndRemovedBeforeLoaded();
|
|
134
134
|
}
|
|
135
135
|
doGet() {
|
|
136
136
|
(0, __1.ensureNotDeleted)(this.entity, "pending");
|
|
137
|
-
if (this
|
|
137
|
+
if (this.#loaded === undefined) {
|
|
138
138
|
// This should only be callable in the type system if we've already resolved this to an instance
|
|
139
139
|
throw new Error("get was called when not loaded");
|
|
140
140
|
}
|
|
141
|
-
return this
|
|
141
|
+
return this.#loaded;
|
|
142
142
|
}
|
|
143
143
|
get getWithDeleted() {
|
|
144
144
|
return this.filterDeleted(this.doGet(), { withDeleted: true });
|
|
@@ -148,11 +148,11 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
148
148
|
}
|
|
149
149
|
set(values) {
|
|
150
150
|
(0, __1.ensureNotDeleted)(this.entity);
|
|
151
|
-
if (this
|
|
151
|
+
if (this.#loaded === undefined) {
|
|
152
152
|
throw new Error("set was called when not loaded");
|
|
153
153
|
}
|
|
154
154
|
// Make a copy for safe iteration
|
|
155
|
-
const loaded = [...this
|
|
155
|
+
const loaded = [...this.#loaded];
|
|
156
156
|
// Remove old values
|
|
157
157
|
for (const other of loaded) {
|
|
158
158
|
if (!values.includes(other))
|
|
@@ -166,16 +166,16 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
166
166
|
}
|
|
167
167
|
removeAll() {
|
|
168
168
|
(0, __1.ensureNotDeleted)(this.entity);
|
|
169
|
-
if (this
|
|
169
|
+
if (this.#loaded === undefined) {
|
|
170
170
|
throw new Error("removeAll was called when not loaded");
|
|
171
171
|
}
|
|
172
|
-
for (const other of [...this
|
|
172
|
+
for (const other of [...this.#loaded]) {
|
|
173
173
|
this.remove(other);
|
|
174
174
|
}
|
|
175
175
|
}
|
|
176
176
|
// impl details
|
|
177
177
|
setFromOpts(others) {
|
|
178
|
-
this
|
|
178
|
+
this.#loaded = [];
|
|
179
179
|
others.forEach((o) => this.add(o));
|
|
180
180
|
}
|
|
181
181
|
maybeCascadeDelete() {
|
|
@@ -192,21 +192,26 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
192
192
|
const m2m = other[this.otherFieldName];
|
|
193
193
|
m2m.remove(this.entity);
|
|
194
194
|
});
|
|
195
|
-
this
|
|
195
|
+
this.#loaded = [];
|
|
196
196
|
}
|
|
197
197
|
maybeApplyAddedAndRemovedBeforeLoaded() {
|
|
198
|
-
if (this
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
198
|
+
if (this.#loaded) {
|
|
199
|
+
this.#addedBeforeLoaded?.forEach((e) => {
|
|
200
|
+
if (!this.#loaded?.includes(e)) {
|
|
201
|
+
// Push on the end to better match the db order of "newer things come last"
|
|
202
|
+
this.#loaded?.unshift(e);
|
|
203
|
+
(0, __1.getEmInternalApi)(this.entity.em).joinRows(this).addNew(this, this.entity, e);
|
|
204
|
+
}
|
|
204
205
|
});
|
|
205
|
-
this
|
|
206
|
+
this.#removedBeforeLoaded?.forEach((e) => {
|
|
207
|
+
(0, utils_1.remove)(this.#loaded, e);
|
|
208
|
+
(0, __1.getEmInternalApi)(this.entity.em).joinRows(this).addRemove(this, this.entity, e);
|
|
209
|
+
});
|
|
210
|
+
this.#removedBeforeLoaded = undefined;
|
|
206
211
|
}
|
|
207
212
|
}
|
|
208
213
|
current(opts) {
|
|
209
|
-
return this.filterDeleted(this
|
|
214
|
+
return this.filterDeleted(this.#loaded ?? this.#addedBeforeLoaded ?? [], opts);
|
|
210
215
|
}
|
|
211
216
|
get meta() {
|
|
212
217
|
return (0, __1.getMetadata)(this.entity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToManyCollection.js","sourceRoot":"","sources":["../../src/relations/ManyToManyCollection.ts"],"names":[],"mappings":";;;AAAA,2BAUa;AACb,8EAA2E;AAC3E,sFAAmF;AACnF,sCAAuC;AACvC,oCAAyD;AACzD,iEAA8D;AAC9D,yCAAkD;AAElD,sDAAsD;AACtD,SAAgB,aAAa,CAC3B,MAAS,EACT,aAAqB,EACrB,SAA2B,EAC3B,UAAkB,EAClB,SAA4B,EAC5B,cAAgC,EAChC,eAAuB;IAEvB,OAAO,IAAI,oBAAoB,CAC7B,aAAa,EACb,MAAM,EACN,SAAS,EACT,UAAU,EACV,SAAS,EACT,cAAc,EACd,eAAe,CAChB,CAAC;AACJ,CAAC;AAlBD,sCAkBC;AAED,MAAa,oBACX,SAAQ,2CAA4B;IAS3B;IAOA;IACA;IAEA;IACA;IAjBA,UAAU,CAAmB;
|
|
1
|
+
{"version":3,"file":"ManyToManyCollection.js","sourceRoot":"","sources":["../../src/relations/ManyToManyCollection.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.143.
|
|
3
|
+
"version": "1.143.2",
|
|
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.6",
|
|
23
23
|
"dataloader": "^2.2.2",
|
|
24
|
-
"joist-utils": "1.143.
|
|
24
|
+
"joist-utils": "1.143.2",
|
|
25
25
|
"knex": "^3.1.0",
|
|
26
26
|
"object-hash": "^3.0.0",
|
|
27
27
|
"pg": "^8.11.3",
|