joist-core 2.3.0-next.57 → 2.3.0-next.59

package/build/EntityManager.cjs

@@ -496,6 +496,7 @@ var EntityManager = class EntityManager {
 			skipIf,
 			skip
 		});
+		const deferredRelations = [];
 		const clones = [...todo].map((entity) => {
 			const skip = skipMap.get(entity) ?? [];
 			const meta = require_EntityMetadata.getMetadata(entity);
@@ -504,10 +505,22 @@ var EntityManager = class EntityManager {
 				switch (f.kind) {
 					case "primitive": if (!f.derived && !f.protected) return [f.fieldName, require_fields.getField(entity, f.fieldName)];
 					else return;
-					case "m2o":
 					case "enum": if (f.derived) return;
 					else return [f.fieldName, require_fields.getField(entity, f.fieldName)];
-					case "poly": return [f.fieldName, require_fields.getField(entity, f.fieldName)];
+					case "m2o":
+					case "poly": {
+						if (f.kind === "m2o" && f.derived) return void 0;
+						const existingIdOrEntity = require_fields.getField(entity, f.fieldName);
+						const target = require_Entity.isEntity(existingIdOrEntity) ? existingIdOrEntity : this.getEntity(existingIdOrEntity);
+						if (target && todo.has(target)) {
+							deferredRelations.push([
+								entity,
+								f.fieldName,
+								target
+							]);
+							return [f.fieldName, void 0];
+						} else return [f.fieldName, existingIdOrEntity];
+					}
 					case "primaryKey":
 					case "o2m":
 					case "m2m":
@@ -529,6 +542,9 @@ var EntityManager = class EntityManager {
 				}
 			});
 		});
+		deferredRelations.forEach(([source, fieldName, target]) => {
+			entityToClone.get(source)[fieldName].set(entityToClone.get(target));
+		});
 		if (postClone) await Promise.all(clones.map(([original, clone]) => postClone(original, clone)));
 		return Array.isArray(entityOrArray) ? entityOrArray.filter((original) => entityToClone.has(original)).map((original) => entityToClone.get(original)) : clones[0] ? clones[0][1] : require_utils.fail("no entities were cloned given the provided options");
 	}