joist-orm 1.107.1 → 1.108.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/BaseEntity.d.ts +10 -7
- package/build/src/BaseEntity.d.ts.map +1 -1
- package/build/src/BaseEntity.js +3 -8
- package/build/src/BaseEntity.js.map +1 -1
- package/build/src/Entity.d.ts +4 -4
- package/build/src/Entity.d.ts.map +1 -1
- package/build/src/EntityManager.d.ts.map +1 -1
- package/build/src/EntityManager.js +8 -6
- package/build/src/EntityManager.js.map +1 -1
- package/build/src/JoinRows.d.ts.map +1 -1
- package/build/src/JoinRows.js +4 -2
- package/build/src/JoinRows.js.map +1 -1
- package/build/src/QueryParser.js +2 -2
- package/build/src/QueryParser.js.map +1 -1
- package/build/src/drivers/IdAssigner.js +2 -2
- package/build/src/drivers/IdAssigner.js.map +1 -1
- package/build/src/drivers/InMemoryDriver.js +2 -2
- package/build/src/drivers/InMemoryDriver.js.map +1 -1
- package/build/src/keys.js +1 -1
- package/build/src/keys.js.map +1 -1
- package/build/src/loadHints.js +1 -1
- package/build/src/loadHints.js.map +1 -1
- package/build/src/loadLens.js +2 -2
- package/build/src/loadLens.js.map +1 -1
- package/build/src/newTestInstance.d.ts.map +1 -1
- package/build/src/newTestInstance.js +1 -1
- package/build/src/newTestInstance.js.map +1 -1
- package/build/src/relations/CustomReference.d.ts +4 -4
- package/build/src/relations/CustomReference.d.ts.map +1 -1
- package/build/src/relations/CustomReference.js +5 -6
- package/build/src/relations/CustomReference.js.map +1 -1
- package/build/src/relations/ManyToManyCollection.js +1 -1
- package/build/src/relations/ManyToManyCollection.js.map +1 -1
- package/build/src/relations/ManyToOneReference.d.ts +21 -12
- package/build/src/relations/ManyToOneReference.d.ts.map +1 -1
- package/build/src/relations/ManyToOneReference.js +47 -24
- package/build/src/relations/ManyToOneReference.js.map +1 -1
- package/build/src/relations/OneToManyCollection.js +2 -2
- package/build/src/relations/OneToManyCollection.js.map +1 -1
- package/build/src/relations/OneToManyLargeCollection.js +1 -1
- package/build/src/relations/OneToManyLargeCollection.js.map +1 -1
- package/build/src/relations/OneToOneReference.d.ts +10 -7
- package/build/src/relations/OneToOneReference.d.ts.map +1 -1
- package/build/src/relations/OneToOneReference.js +21 -8
- package/build/src/relations/OneToOneReference.js.map +1 -1
- package/build/src/relations/PolymorphicReference.d.ts +13 -9
- package/build/src/relations/PolymorphicReference.d.ts.map +1 -1
- package/build/src/relations/PolymorphicReference.js +18 -10
- package/build/src/relations/PolymorphicReference.js.map +1 -1
- package/build/src/relations/hasPersistedAsyncReference.d.ts +13 -11
- package/build/src/relations/hasPersistedAsyncReference.d.ts.map +1 -1
- package/build/src/relations/hasPersistedAsyncReference.js +23 -15
- package/build/src/relations/hasPersistedAsyncReference.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ManyToOneReferenceImpl = exports.isManyToOneReference = exports.hasOne = void 0;
|
|
3
|
+
exports.failIfNewEntity = exports.failNoId = exports.ManyToOneReferenceImpl = exports.isManyToOneReference = exports.hasOne = void 0;
|
|
4
4
|
const Entity_1 = require("../Entity");
|
|
5
5
|
const EntityManager_1 = require("../EntityManager");
|
|
6
6
|
const EntityMetadata_1 = require("../EntityMetadata");
|
|
@@ -92,21 +92,11 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
92
92
|
get get() {
|
|
93
93
|
return this.doGet({ withDeleted: false });
|
|
94
94
|
}
|
|
95
|
-
/** Returns the tagged id of the current value. */
|
|
96
|
-
get idTagged() {
|
|
97
|
-
(0, index_1.ensureNotDeleted)(this.#entity, "pending");
|
|
98
|
-
return (0, index_1.maybeResolveReferenceToId)(this.current());
|
|
99
|
-
}
|
|
100
95
|
/** Returns the id of the current value. */
|
|
101
96
|
get id() {
|
|
102
|
-
|
|
103
|
-
// If current is a string, we might need to detag it...
|
|
104
|
-
const id = (0, index_1.maybeResolveReferenceToId)(this.current());
|
|
105
|
-
if (!this.otherMeta.idTagged && id) {
|
|
106
|
-
return (0, index_1.deTagId)(this.otherMeta, id);
|
|
107
|
-
}
|
|
108
|
-
return id;
|
|
97
|
+
return this.idMaybe || failNoId(this.current());
|
|
109
98
|
}
|
|
99
|
+
/** Sets the m2o to `id`, and allows accepting `undefined` (`N`) if this is a nullable relation. */
|
|
110
100
|
set id(id) {
|
|
111
101
|
(0, index_1.ensureNotDeleted)(this.#entity, "pending");
|
|
112
102
|
if (id && !(0, index_1.isTaggedId)(id)) {
|
|
@@ -122,6 +112,34 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
122
112
|
this.maybeRemove(previous);
|
|
123
113
|
this.maybeAdd();
|
|
124
114
|
}
|
|
115
|
+
get idIfSet() {
|
|
116
|
+
failIfNewEntity(this.current());
|
|
117
|
+
return this.idMaybe;
|
|
118
|
+
}
|
|
119
|
+
get idUntagged() {
|
|
120
|
+
return this.idUntaggedMaybe || failNoId(this.current());
|
|
121
|
+
}
|
|
122
|
+
get idUntaggedIfSet() {
|
|
123
|
+
failIfNewEntity(this.current());
|
|
124
|
+
return this.idUntaggedMaybe;
|
|
125
|
+
}
|
|
126
|
+
get idMaybe() {
|
|
127
|
+
(0, index_1.ensureNotDeleted)(this.#entity, "pending");
|
|
128
|
+
// If current is a string, we might need to detag it...
|
|
129
|
+
let id = (0, index_1.maybeResolveReferenceToId)(this.current());
|
|
130
|
+
if (!this.otherMeta.idTagged && id) {
|
|
131
|
+
id = (0, index_1.deTagId)(this.otherMeta, id);
|
|
132
|
+
}
|
|
133
|
+
return id;
|
|
134
|
+
}
|
|
135
|
+
get idUntaggedMaybe() {
|
|
136
|
+
return (0, index_1.deTagId)(this.otherMeta, this.idMaybe);
|
|
137
|
+
}
|
|
138
|
+
/** Returns the tagged id of the current value. */
|
|
139
|
+
get idTagged() {
|
|
140
|
+
(0, index_1.ensureNotDeleted)(this.#entity, "pending");
|
|
141
|
+
return (0, index_1.maybeResolveReferenceToId)(this.current());
|
|
142
|
+
}
|
|
125
143
|
// Internal method used by OneToManyCollection
|
|
126
144
|
setImpl(other) {
|
|
127
145
|
(0, index_1.ensureNotDeleted)(this.#entity, "pending");
|
|
@@ -132,7 +150,7 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
132
150
|
}
|
|
133
151
|
const previous = this.maybeFindEntity();
|
|
134
152
|
// Prefer to keep the id in our data hash, but if this is a new entity w/o an id, use the entity itself
|
|
135
|
-
(0, index_1.setField)(this.#entity, this.fieldName, (0, Entity_1.isEntity)(other) ? other?.
|
|
153
|
+
(0, index_1.setField)(this.#entity, this.fieldName, (0, Entity_1.isEntity)(other) ? other?.idTaggedMaybe ?? other : other);
|
|
136
154
|
if (typeof other === "string") {
|
|
137
155
|
this.loaded = undefined;
|
|
138
156
|
this._isLoaded = false;
|
|
@@ -144,16 +162,6 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
144
162
|
this.maybeRemove(previous);
|
|
145
163
|
this.maybeAdd();
|
|
146
164
|
}
|
|
147
|
-
get idOrFail() {
|
|
148
|
-
(0, index_1.ensureNotDeleted)(this.#entity, "pending");
|
|
149
|
-
return this.id || (0, index_1.fail)("Reference is unset or assigned to a new entity");
|
|
150
|
-
}
|
|
151
|
-
get idUntagged() {
|
|
152
|
-
return this.id && (0, index_1.deTagIds)(this.otherMeta, [this.id])[0];
|
|
153
|
-
}
|
|
154
|
-
get idUntaggedOrFail() {
|
|
155
|
-
return this.idUntagged || (0, index_1.fail)("Reference is unset or assigned to a new entity");
|
|
156
|
-
}
|
|
157
165
|
// private impl
|
|
158
166
|
setFromOpts(other) {
|
|
159
167
|
this.setImpl(other);
|
|
@@ -293,4 +301,19 @@ class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
293
301
|
[Reference_1.ReferenceN] = null;
|
|
294
302
|
}
|
|
295
303
|
exports.ManyToOneReferenceImpl = ManyToOneReferenceImpl;
|
|
304
|
+
/** Fails when we can't return an id for a reference, i.e. it's unset or a new entity. */
|
|
305
|
+
function failNoId(current) {
|
|
306
|
+
if (!current)
|
|
307
|
+
(0, index_1.fail)("Reference is unset");
|
|
308
|
+
if (current instanceof index_1.BaseEntity && current.isNewEntity)
|
|
309
|
+
(0, index_1.fail)("Reference is assigned to a new entity");
|
|
310
|
+
(0, index_1.fail)("Reference is unset or assigned to a new entity");
|
|
311
|
+
}
|
|
312
|
+
exports.failNoId = failNoId;
|
|
313
|
+
/** Fails when we can't return an id for a reference, i.e. it's unset or a new entity. */
|
|
314
|
+
function failIfNewEntity(current) {
|
|
315
|
+
if (current instanceof index_1.BaseEntity && current.isNewEntity)
|
|
316
|
+
(0, index_1.fail)("Reference is assigned to a new entity");
|
|
317
|
+
}
|
|
318
|
+
exports.failIfNewEntity = failIfNewEntity;
|
|
296
319
|
//# sourceMappingURL=ManyToOneReference.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToOneReference.js","sourceRoot":"","sources":["../../../src/relations/ManyToOneReference.ts"],"names":[],"mappings":";;;AAAA,sCAA6C;AAC7C,oDAAoG;AACpG,sDAAgF;AAChF,oCAakB;AAClB,iEAA8D;AAC9D,+DAA4D;AAC5D,2CAAyC;AACzC,yCAAkD;AAElD,mDAAmD;AACnD,SAAgB,MAAM,CACpB,SAA4B,EAC5B,SAA2B,EAC3B,cAAgC;IAEhC,MAAM,MAAM,GAAG,4CAAiC,CAAC;IACjD,OAAO,IAAI,sBAAsB,CAAU,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;AAC3F,CAAC;AAPD,wBAOC;AAED,qFAAqF;AACrF,SAAgB,oBAAoB,CAAC,cAAmB;IACtD,OAAO,cAAc,YAAY,sBAAsB,CAAC;AAC1D,CAAC;AAFD,oDAEC;
|
|
1
|
+
{"version":3,"file":"ManyToOneReference.js","sourceRoot":"","sources":["../../../src/relations/ManyToOneReference.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,7 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
57
57
|
return added;
|
|
58
58
|
}
|
|
59
59
|
// Make a cacheable tuple to look up this specific o2m row
|
|
60
|
-
const key = `id=${id},${this.otherColumnName}=${this.#entity.
|
|
60
|
+
const key = `id=${id},${this.otherColumnName}=${this.#entity.id}`;
|
|
61
61
|
return (0, oneToManyFindDataLoader_1.oneToManyFindDataLoader)(this.#entity.em, this).load(key);
|
|
62
62
|
}
|
|
63
63
|
}
|
|
@@ -175,7 +175,7 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
|
|
|
175
175
|
const current = await this.load({ withDeleted: true });
|
|
176
176
|
current.forEach((other) => {
|
|
177
177
|
const m2o = this.getOtherRelation(other);
|
|
178
|
-
if ((0, index_1.maybeResolveReferenceToId)(m2o.current({ withDeleted: true })) === this.#entity.
|
|
178
|
+
if ((0, index_1.maybeResolveReferenceToId)(m2o.current({ withDeleted: true })) === this.#entity.idMaybe) {
|
|
179
179
|
// TODO What if other.otherFieldName is required/not-null?
|
|
180
180
|
m2o.set(undefined);
|
|
181
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneToManyCollection.js","sourceRoot":"","sources":["../../../src/relations/OneToManyCollection.ts"],"names":[],"mappings":";;;AAAA,4EAAyE;AACzE,oFAAiF;AACjF,oCAakB;AAClB,oCAAiD;AACjD,iEAA8D;AAE9D,yCAAkD;AAElD,oDAAoD;AACpD,SAAgB,OAAO,CACrB,SAA4B,EAC5B,SAA2B,EAC3B,cAAgC,EAChC,eAAuB,EACvB,OAA2D;IAE3D,MAAM,MAAM,GAAG,oCAAiC,CAAC;IACjD,OAAO,IAAI,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;AACzG,CAAC;AATD,0BASC;AAED,MAAa,mBACX,SAAQ,2CAAyB;IAiBxB;IACA;IACA;IAhBA,OAAO,CAAI;IACX,UAAU,CAAmB;IAC7B,QAAQ,CAAqD;IAC9D,MAAM,CAAkB;IAChC,mGAAmG;IACnG,yGAAyG;IACzG,wGAAwG;IACxG,oFAAoF;IACpF,kBAAkB,CAAkB;IAEpC;IACE,wFAAwF;IACxF,MAAS,EACT,SAA4B,EACrB,SAA2B,EAC3B,cAAgC,EAChC,eAAuB,EAC9B,OAA2D;QAE3D,KAAK,EAAE,CAAC;QALD,cAAS,GAAT,SAAS,CAAkB;QAC3B,mBAAc,GAAd,cAAc,CAAkB;QAChC,oBAAe,GAAf,eAAe,CAAQ;QAI9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,gCAAgC;IAChC,KAAK,CAAC,IAAI,CAAC,OAAyD,EAAE;QACpE,IAAA,wBAAgB,EAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAChF,IAAI,CAAC,MAAM,GAAG,MAAM,IAAA,yCAAmB,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAS,CAAC,CAAC;YAC5F,IAAI,CAAC,4BAA4B,EAAE,CAAC;SACrC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAW;QACpB,IAAA,wBAAgB,EAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;SACrD;aAAM;YACL,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAChE,IAAI,KAAK,EAAE;gBACT,OAAO,KAAK,CAAC;aACd;YACD,0DAA0D;YAC1D,MAAM,GAAG,GAAG,MAAM,EAAE,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"OneToManyCollection.js","sourceRoot":"","sources":["../../../src/relations/OneToManyCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ class OneToManyLargeCollection {
|
|
|
47
47
|
return undefined;
|
|
48
48
|
}
|
|
49
49
|
// Make a cacheable tuple to look up this specific o2m row
|
|
50
|
-
const key = `id=${id},${this.otherColumnName}=${this.entity.
|
|
50
|
+
const key = `id=${id},${this.otherColumnName}=${this.entity.id}`;
|
|
51
51
|
return (0, oneToManyFindDataLoader_1.oneToManyFindDataLoader)(this.entity.em, this).load(key);
|
|
52
52
|
}
|
|
53
53
|
async includes(other) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneToManyLargeCollection.js","sourceRoot":"","sources":["../../../src/relations/OneToManyLargeCollection.ts"],"names":[],"mappings":";;;AAAA,oFAAiF;AAEjF,oDAAkF;AAElF,oCAAiF;AACjF,oCAAkC;AAElC,yCAAkD;AAElD,yDAAyD;AACzD,SAAgB,YAAY,CAC1B,SAA4B,EAC5B,SAA2B,EAC3B,cAAgC,EAChC,eAAuB;IAEvB,MAAM,MAAM,GAAG,4CAAiC,CAAC;IACjD,OAAO,IAAI,wBAAwB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;AACrG,CAAC;AARD,oCAQC;AAED,MAAa,wBAAwB;IAQ1B;IACA;IACA;IACA;IACA;IAXT,wEAAwE;IACxE,4CAA4C;IACpC,YAAY,GAAQ,EAAE,CAAC;IACvB,cAAc,GAAQ,EAAE,CAAC;IAEjC;IACE,wFAAwF;IACjF,MAAS,EACT,SAA4B,EAC5B,SAA2B,EAC3B,cAAgC,EAChC,eAAuB;QAJvB,WAAM,GAAN,MAAM,CAAG;QACT,cAAS,GAAT,SAAS,CAAmB;QAC5B,cAAS,GAAT,SAAS,CAAkB;QAC3B,mBAAc,GAAd,cAAc,CAAkB;QAChC,oBAAe,GAAf,eAAe,CAAQ;IAC7B,CAAC;IAEJ,KAAK,CAAC,IAAI,CAAC,EAAW;QACpB,IAAA,wBAAgB,EAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEzC,qGAAqG;QACrG,8FAA8F;QAC9F,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5D,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC;SACjB;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACjE,IAAI,WAAW,EAAE;YACf,OAAO,SAAS,CAAC;SAClB;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAC3B,OAAO,SAAS,CAAC;SAClB;QAED,0DAA0D;QAC1D,MAAM,GAAG,GAAG,MAAM,EAAE,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"OneToManyLargeCollection.js","sourceRoot":"","sources":["../../../src/relations/OneToManyLargeCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,10 @@ export interface LoadedOneToOneReference<T extends Entity, U extends Entity> ext
|
|
|
14
14
|
get: U | undefined;
|
|
15
15
|
getWithDeleted: U | undefined;
|
|
16
16
|
/** Returns the id of the current assigned entity or a runtime error if it's either a) unset or b) set to a new entity that doesn't have an `id` yet. */
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
id: IdOf<U>;
|
|
18
|
+
idIfSet: IdOf<U> | undefined;
|
|
19
|
+
idUntagged: string;
|
|
20
|
+
idUntaggedMaybe: string | undefined;
|
|
20
21
|
/** Returns `true` if this relation is currently set (i.e. regardless of whether it's loaded, or if it is set but the assigned entity doesn't have an id saved. */
|
|
21
22
|
readonly isSet: boolean;
|
|
22
23
|
}
|
|
@@ -52,10 +53,12 @@ export declare class OneToOneReferenceImpl<T extends Entity, U extends Entity> e
|
|
|
52
53
|
private _isLoaded;
|
|
53
54
|
private isCascadeDelete;
|
|
54
55
|
constructor(entity: T, otherMeta: EntityMetadata<U>, fieldName: keyof T & string, otherFieldName: keyof U & string, otherColumnName: string);
|
|
55
|
-
get id(): IdOf<U
|
|
56
|
-
get
|
|
57
|
-
get idUntagged(): string
|
|
58
|
-
get
|
|
56
|
+
get id(): IdOf<U>;
|
|
57
|
+
get idIfSet(): IdOf<U> | undefined;
|
|
58
|
+
get idUntagged(): string;
|
|
59
|
+
get idUntaggedIfSet(): string | undefined;
|
|
60
|
+
private get idMaybe();
|
|
61
|
+
private get idUntaggedMaybe();
|
|
59
62
|
get isSet(): boolean;
|
|
60
63
|
load(opts?: {
|
|
61
64
|
withDeleted?: boolean;
|
|
@@ -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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"}
|
|
@@ -5,6 +5,7 @@ const __1 = require("../");
|
|
|
5
5
|
const oneToOneDataLoader_1 = require("../dataloaders/oneToOneDataLoader");
|
|
6
6
|
const EntityMetadata_1 = require("../EntityMetadata");
|
|
7
7
|
const AbstractRelationImpl_1 = require("./AbstractRelationImpl");
|
|
8
|
+
const ManyToOneReference_1 = require("./ManyToOneReference");
|
|
8
9
|
const Reference_1 = require("./Reference");
|
|
9
10
|
const Relation_1 = require("./Relation");
|
|
10
11
|
const OneToOne = Symbol();
|
|
@@ -62,19 +63,31 @@ class OneToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
62
63
|
this.isCascadeDelete = (0, EntityMetadata_1.getMetadata)(entity).config.__data.cascadeDeleteFields.includes(fieldName);
|
|
63
64
|
}
|
|
64
65
|
get id() {
|
|
66
|
+
return this.idMaybe || (0, ManyToOneReference_1.failNoId)(this.loaded);
|
|
67
|
+
}
|
|
68
|
+
get idIfSet() {
|
|
65
69
|
if (this._isLoaded) {
|
|
66
|
-
|
|
70
|
+
(0, ManyToOneReference_1.failIfNewEntity)(this.loaded);
|
|
71
|
+
return this.idMaybe;
|
|
67
72
|
}
|
|
68
73
|
throw new Error(`${this.#entity}.${this.fieldName} was not loaded`);
|
|
69
74
|
}
|
|
70
|
-
get idOrFail() {
|
|
71
|
-
return this.id || (0, __1.fail)(`${this.#entity}.${this.fieldName} has no id yet`);
|
|
72
|
-
}
|
|
73
75
|
get idUntagged() {
|
|
74
|
-
return this.
|
|
76
|
+
return this.idUntaggedMaybe || (0, ManyToOneReference_1.failNoId)(this.loaded);
|
|
77
|
+
}
|
|
78
|
+
get idUntaggedIfSet() {
|
|
79
|
+
(0, ManyToOneReference_1.failIfNewEntity)(this.loaded);
|
|
80
|
+
return this.idUntaggedMaybe;
|
|
81
|
+
}
|
|
82
|
+
get idMaybe() {
|
|
83
|
+
(0, __1.ensureNotDeleted)(this.#entity, "pending");
|
|
84
|
+
if (this._isLoaded) {
|
|
85
|
+
return this.loaded?.idMaybe;
|
|
86
|
+
}
|
|
87
|
+
throw new Error(`${this.#entity}.${this.fieldName} was not loaded`);
|
|
75
88
|
}
|
|
76
|
-
get
|
|
77
|
-
return
|
|
89
|
+
get idUntaggedMaybe() {
|
|
90
|
+
return (0, __1.deTagId)(this.#otherMeta, this.idMaybe);
|
|
78
91
|
}
|
|
79
92
|
get isSet() {
|
|
80
93
|
if (this._isLoaded) {
|
|
@@ -87,7 +100,7 @@ class OneToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl
|
|
|
87
100
|
(0, __1.ensureNotDeleted)(this.#entity, "pending");
|
|
88
101
|
if (!this._isLoaded || opts.forceReload) {
|
|
89
102
|
if (!this.#entity.isNewEntity) {
|
|
90
|
-
this.loaded = await (0, oneToOneDataLoader_1.oneToOneDataLoader)(this.#entity.em, this).load(this.#entity.
|
|
103
|
+
this.loaded = await (0, oneToOneDataLoader_1.oneToOneDataLoader)(this.#entity.em, this).load(this.#entity.idTagged);
|
|
91
104
|
}
|
|
92
105
|
this._isLoaded = true;
|
|
93
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneToOneReference.js","sourceRoot":"","sources":["../../../src/relations/OneToOneReference.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"OneToOneReference.js","sourceRoot":"","sources":["../../../src/relations/OneToOneReference.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,11 +9,13 @@ export declare function hasOnePolymorphic<T extends Entity, U extends Entity, N
|
|
|
9
9
|
export declare function isPolymorphicReference(maybeReference: any): maybeReference is PolymorphicReference<any, any, any>;
|
|
10
10
|
export interface PolymorphicReference<T extends Entity, U extends Entity, N extends never | undefined> extends Reference<T, U, N> {
|
|
11
11
|
/** Returns the id of the current assigned entity (or `undefined` if its new and has no id yet), or `undefined` if this column is nullable and currently unset. */
|
|
12
|
-
id: IdOf<U
|
|
13
|
-
/** Returns the id of the current assigned entity or a runtime error if
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
12
|
+
id: IdOf<U>;
|
|
13
|
+
/** Returns the id of the current assigned entity, undefined if unset, or a runtime error if set to a new entity. */
|
|
14
|
+
idIfSet: IdOf<U> | undefined;
|
|
15
|
+
/** Returns the id of the current assigned entity, undefined if unset, or undefined if set to a new entity. */
|
|
16
|
+
idMaybe: IdOf<U> | undefined;
|
|
17
|
+
idUntagged: string;
|
|
18
|
+
idUntaggedIfSet: string | undefined;
|
|
17
19
|
/** Returns `true` if this relation is currently set (i.e. regardless of whether it's loaded, or if it is set but the assigned entity doesn't have an id saved. */
|
|
18
20
|
readonly isSet: boolean;
|
|
19
21
|
}
|
|
@@ -47,10 +49,12 @@ export declare class PolymorphicReferenceImpl<T extends Entity, U extends Entity
|
|
|
47
49
|
private doGet;
|
|
48
50
|
get getWithDeleted(): U | N;
|
|
49
51
|
get get(): U | N;
|
|
50
|
-
get id(): IdOf<U
|
|
51
|
-
get
|
|
52
|
-
get idUntagged(): string
|
|
53
|
-
get
|
|
52
|
+
get id(): IdOf<U>;
|
|
53
|
+
get idIfSet(): IdOf<U> | N | undefined;
|
|
54
|
+
get idUntagged(): string;
|
|
55
|
+
get idUntaggedIfSet(): string | undefined;
|
|
56
|
+
get idMaybe(): IdOf<U> | undefined;
|
|
57
|
+
private get idUntaggedMaybe();
|
|
54
58
|
setFromOpts(other: U): void;
|
|
55
59
|
initializeForNewEntity(): void;
|
|
56
60
|
maybeCascadeDelete(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PolymorphicReference.d.ts","sourceRoot":"","sources":["../../../src/relations/PolymorphicReference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,IAAI,EAA4C,MAAM,kBAAkB,CAAC;AAElF,OAAO,EAGL,SAAS,EAQV,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"PolymorphicReference.d.ts","sourceRoot":"","sources":["../../../src/relations/PolymorphicReference.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const EntityManager_1 = require("../EntityManager");
|
|
|
6
6
|
const EntityMetadata_1 = require("../EntityMetadata");
|
|
7
7
|
const index_1 = require("../index");
|
|
8
8
|
const AbstractRelationImpl_1 = require("./AbstractRelationImpl");
|
|
9
|
+
const ManyToOneReference_1 = require("./ManyToOneReference");
|
|
9
10
|
const OneToManyCollection_1 = require("./OneToManyCollection");
|
|
10
11
|
const Reference_1 = require("./Reference");
|
|
11
12
|
const Relation_1 = require("./Relation");
|
|
@@ -90,20 +91,27 @@ class PolymorphicReferenceImpl extends AbstractRelationImpl_1.AbstractRelationIm
|
|
|
90
91
|
return this.doGet({ withDeleted: false });
|
|
91
92
|
}
|
|
92
93
|
get id() {
|
|
93
|
-
(0,
|
|
94
|
-
return (0, index_1.maybeResolveReferenceToId)(this.current());
|
|
94
|
+
return this.idMaybe || (0, ManyToOneReference_1.failNoId)(this.current());
|
|
95
95
|
}
|
|
96
|
-
get
|
|
97
|
-
(0,
|
|
98
|
-
return this.
|
|
96
|
+
get idIfSet() {
|
|
97
|
+
(0, ManyToOneReference_1.failIfNewEntity)(this.current());
|
|
98
|
+
return this.idMaybe;
|
|
99
99
|
}
|
|
100
100
|
get idUntagged() {
|
|
101
|
-
return this.
|
|
101
|
+
return this.idUntaggedMaybe || (0, ManyToOneReference_1.failNoId)(this.current());
|
|
102
102
|
}
|
|
103
|
-
get
|
|
104
|
-
|
|
103
|
+
get idUntaggedIfSet() {
|
|
104
|
+
(0, ManyToOneReference_1.failIfNewEntity)(this.current());
|
|
105
|
+
return this.idUntaggedMaybe;
|
|
106
|
+
}
|
|
107
|
+
get idMaybe() {
|
|
108
|
+
(0, index_1.ensureNotDeleted)(this.entity, "pending");
|
|
109
|
+
return (0, index_1.maybeResolveReferenceToId)(this.current());
|
|
105
110
|
}
|
|
106
111
|
// private impl
|
|
112
|
+
get idUntaggedMaybe() {
|
|
113
|
+
return this.idMaybe && (0, index_1.deTagId)((0, EntityMetadata_1.getMetadata)((0, index_1.getConstructorFromTaggedId)(this.idMaybe)), this.idMaybe);
|
|
114
|
+
}
|
|
107
115
|
setFromOpts(other) {
|
|
108
116
|
this.setImpl(other);
|
|
109
117
|
}
|
|
@@ -154,7 +162,7 @@ class PolymorphicReferenceImpl extends AbstractRelationImpl_1.AbstractRelationIm
|
|
|
154
162
|
const previousLoaded = this.loaded ?? this.maybeFindExisting();
|
|
155
163
|
(0, index_1.ensureNotDeleted)(this.entity, "pending");
|
|
156
164
|
// Prefer to keep the id in our data hash, but if this is a new entity w/o an id, use the entity itself
|
|
157
|
-
const changed = (0, index_1.setField)(this.entity, this.fieldName, (0, Entity_1.isEntity)(other) ? other?.
|
|
165
|
+
const changed = (0, index_1.setField)(this.entity, this.fieldName, (0, Entity_1.isEntity)(other) ? other?.idTaggedMaybe ?? other : other);
|
|
158
166
|
if (typeof other === "string") {
|
|
159
167
|
this.loaded = undefined;
|
|
160
168
|
this._isLoaded = false;
|
|
@@ -204,7 +212,7 @@ class PolymorphicReferenceImpl extends AbstractRelationImpl_1.AbstractRelationIm
|
|
|
204
212
|
return other[component?.otherFieldName];
|
|
205
213
|
}
|
|
206
214
|
maybeFindExisting() {
|
|
207
|
-
return this.
|
|
215
|
+
return this.idMaybe !== undefined ? this.entity.em.getEntity(this.id) : undefined;
|
|
208
216
|
}
|
|
209
217
|
[Relation_1.RelationT] = null;
|
|
210
218
|
[Relation_1.RelationU] = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PolymorphicReference.js","sourceRoot":"","sources":["../../../src/relations/PolymorphicReference.ts"],"names":[],"mappings":";;;AAAA,sCAA6C;AAC7C,oDAAkF;AAClF,sDAA2E;AAC3E,oCAWkB;AAClB,iEAA8D;AAC9D,+DAA4D;AAC5D,2CAAyC;AACzC,yCAAkD;AAElD,SAAgB,iBAAiB,CAC/B,SAA2B;IAE3B,MAAM,MAAM,GAAG,4CAAiC,CAAC;IACjD,OAAO,IAAI,wBAAwB,CAAU,MAAM,EAAE,SAAS,CAAC,CAAC;AAClE,CAAC;AALD,8CAKC;AAED,uFAAuF;AACvF,SAAgB,sBAAsB,CAAC,cAAmB;IACxD,OAAO,cAAc,YAAY,wBAAwB,CAAC;AAC5D,CAAC;AAFD,wDAEC;
|
|
1
|
+
{"version":3,"file":"PolymorphicReference.js","sourceRoot":"","sources":["../../../src/relations/PolymorphicReference.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,12 +17,12 @@ export interface PersistedAsyncReference<T extends Entity, U extends Entity, N e
|
|
|
17
17
|
* to the new derived entity.
|
|
18
18
|
* */
|
|
19
19
|
fieldValue: U | N;
|
|
20
|
-
/** Returns the id of the current assigned entity
|
|
21
|
-
id: IdOf<U
|
|
22
|
-
/** Returns the id of the current assigned entity or a runtime error if
|
|
23
|
-
|
|
24
|
-
idUntagged: string
|
|
25
|
-
|
|
20
|
+
/** Returns the id of the current assigned entity, or a runtime error if either 1) unset or 2) set to a new entity that doesn't have an `id` yet. */
|
|
21
|
+
id: IdOf<U>;
|
|
22
|
+
/** Returns the id of the current assigned entity, undefined if unset, or a runtime error if set to a new entity. */
|
|
23
|
+
idIfSet: IdOf<U> | undefined;
|
|
24
|
+
idUntagged: string;
|
|
25
|
+
idUntaggedIfSet: string | undefined;
|
|
26
26
|
[I]?: T;
|
|
27
27
|
}
|
|
28
28
|
export declare function hasPersistedAsyncReference<T extends Entity, U extends Entity, const H extends ReactiveHint<T>, N extends never | undefined>(otherMeta: EntityMetadata<U>, fieldName: keyof T & string, hint: H, fn: (entity: Reacted<T, H>) => U | N): PersistedAsyncReference<T, U, N>;
|
|
@@ -49,12 +49,14 @@ export declare class PersistedAsyncReferenceImpl<T extends Entity, U extends Ent
|
|
|
49
49
|
setImpl(other: U | IdOf<U> | N): void;
|
|
50
50
|
/** Returns the tagged id of the current value. */
|
|
51
51
|
private get idTagged();
|
|
52
|
-
|
|
53
|
-
get
|
|
54
|
-
get
|
|
55
|
-
get
|
|
56
|
-
get idUntaggedOrFail(): string;
|
|
52
|
+
get id(): IdOf<U>;
|
|
53
|
+
get idUntagged(): string;
|
|
54
|
+
get idIfSet(): IdOf<U> | N | undefined;
|
|
55
|
+
get idUntaggedIfSet(): string | undefined;
|
|
57
56
|
get loadHint(): any;
|
|
57
|
+
/** Returns the id of the current value. */
|
|
58
|
+
private get idMaybe();
|
|
59
|
+
private get idUntaggedMaybe();
|
|
58
60
|
setFromOpts(other: U | IdOf<U> | N): void;
|
|
59
61
|
initializeForNewEntity(): void;
|
|
60
62
|
maybeCascadeDelete(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasPersistedAsyncReference.d.ts","sourceRoot":"","sources":["../../../src/relations/hasPersistedAsyncReference.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"hasPersistedAsyncReference.d.ts","sourceRoot":"","sources":["../../../src/relations/hasPersistedAsyncReference.ts"],"names":[],"mappings":"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"}
|