joist-core 2.3.0-next.54 → 2.3.0-next.56

package/build/EntityManager.cjs

@@ -1164,7 +1164,7 @@ var EntityManager = class EntityManager {
 		for (const entity of require_utils.toArray(entityOrEntities)) require_BaseEntity.getInstanceData(entity).markTouched();
 	}
 	async recalc(entityOrEntities, reactionName) {
-		const entities = require_utils.toArray(entityOrEntities);
+		const entities = require_utils.toArray(entityOrEntities).filter((entity) => !entity.isDeletedEntity);
 		if (reactionName !== void 0) {
 			const reactions = entities.map((entity) => {
 				return require_EntityMetadata.getBaseAndSelfMetas(require_EntityMetadata.getMetadata(entity)).flatMap((meta) => meta.config.__data.reactions).find((reaction) => reaction.name === reactionName) ?? require_utils.fail(`Reaction '${reactionName}' not found on ${require_EntityMetadata.getMetadata(entity).type}`);
@@ -1174,7 +1174,22 @@ var EntityManager = class EntityManager {
 			return;
 		}
 		const relations = entities.flatMap((entity) => Object.values(require_EntityMetadata.getMetadata(entity).allFields).filter((f) => "derived" in f && f.derived === "async").map((field) => entity[field.fieldName]));
-		await Promise.all(relations.map((r) => r.load({ forceReload: true })));
+		const results = await Promise.allSettled(relations.map((r) => r.load({ forceReload: true })));
+		const relationsPendingAssignedIds = [];
+		const failures = [];
+		results.forEach((result, i) => {
+			if (result.status === "rejected") {
+				if (result.reason instanceof require_index.NoIdError) relationsPendingAssignedIds.push(relations[i]);
+				else failures.push(result.reason);
+			}
+		});
+		if (relationsPendingAssignedIds.length > 0) {
+			await this.assignNewIds();
+			(await Promise.allSettled(relationsPendingAssignedIds.map((r) => r.load({ forceReload: true })))).forEach((result) => {
+				if (result.status === "rejected") failures.push(result.reason);
+			});
+		}
+		if (failures.length > 0) throw failures[0];
 		entities.flatMap((entity) => Object.values(require_EntityMetadata.getMetadata(entity).allFields).filter((f) => "derived" in f && f.derived === "sync").forEach((field) => {
 			require_fields.setField(entity, field.fieldName, entity[field.fieldName]);
 		}));