joist-core 2.4.0-next.41 → 2.4.0-next.42

package/build/EntityManager.cjs

@@ -2,13 +2,19 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
 const require_batchloaders_BatchLoader = require("./batchloaders/BatchLoader.cjs");
 require("./relations/Collection.cjs");
+const require_newEntity = require("./newEntity.cjs");
 const require_relations_CustomCollection = require("./relations/CustomCollection.cjs");
 const require_relations_CustomReference = require("./relations/CustomReference.cjs");
+const require_normalizeHints = require("./normalizeHints.cjs");
+require("./batchloaders/recursiveChildrenBatchLoader.cjs");
+require("./batchloaders/recursiveM2mBatchLoader.cjs");
+require("./batchloaders/recursiveParentsBatchLoader.cjs");
+const require_relations_RecursiveCycleError = require("./relations/RecursiveCycleError.cjs");
+require("./relations/RecursiveCollection.cjs");
+const require_reactivity_reactiveHints = require("./reactivity/reactiveHints.cjs");
 const require_loading_loadHints = require("./loading/loadHints.cjs");
 const require_relations_hasAsyncMethod = require("./relations/hasAsyncMethod.cjs");
-const require_relations_RecursiveCycleError = require("./relations/RecursiveCycleError.cjs");
 const require_relations_AsyncProperty = require("./relations/AsyncProperty.cjs");
-const require_fields = require("./fields.cjs");
 const require_keys = require("./keys.cjs");
 const require_RowData = require("./RowData.cjs");
 const require_relations_LazyField = require("./relations/LazyField.cjs");
@@ -22,15 +28,10 @@ require("./batchloaders/oneToOneBatchLoader.cjs");
 const require_relations_ReactiveReference = require("./relations/ReactiveReference.cjs");
 const require_relations_OneToOneReference = require("./relations/OneToOneReference.cjs");
 const require_relations_PolymorphicReference = require("./relations/PolymorphicReference.cjs");
-require("./batchloaders/recursiveChildrenBatchLoader.cjs");
-require("./batchloaders/recursiveM2mBatchLoader.cjs");
-require("./batchloaders/recursiveParentsBatchLoader.cjs");
-require("./relations/RecursiveCollection.cjs");
 require("./relations/index.cjs");
 const require_utils = require("./utils.cjs");
-const require_newEntity = require("./newEntity.cjs");
-const require_normalizeHints = require("./normalizeHints.cjs");
-const require_reactivity_reactiveHints = require("./reactivity/reactiveHints.cjs");
+const require_fields = require("./fields.cjs");
+const require_flush_ReadDrift = require("./flush/ReadDrift.cjs");
 require("./typeMap.cjs");
 const require_rules = require("./rules.cjs");
 const require_config = require("./config.cjs");
@@ -138,6 +139,7 @@ var EntityManager = class EntityManager {
 		afterCommit: []
 	};
 	#forceTransaction = false;
+	#readSet = /* @__PURE__ */ new Set();
 	#preloader;
 	#fieldLogger = require_logging_FieldLogger.noopFieldLogger;
 	#isLoadedCache = new require_loading_IsLoadedCache.IsLoadedCache();
@@ -1003,9 +1005,11 @@ var EntityManager = class EntityManager {
 			await runValidation(entityTodos, joinRowTodos, !skipValidation);
 			this.#rm.throwIfAnySuppressedTypeErrors();
 			if (suppressedDefaultTypeErrors.length > 0) throw suppressedDefaultTypeErrors[0];
-			if (Object.keys(entityTodos).length > 0 || Object.keys(joinRowTodos).length > 0 || this.#rm.hasPendingCommitTransitions() || this.#forceTransaction) {
+			if (Object.keys(entityTodos).length > 0 || Object.keys(joinRowTodos).length > 0 || this.#rm.hasPendingCommitTransitions() || this.#readSet.size > 0 || this.#forceTransaction) {
+				const checkedReads = /* @__PURE__ */ new Set();
 				await this.driver.transaction(this, async () => {
 					do {
+						if (this.#readSet.size > 0) await require_flush_ReadDrift.checkReadDrift(this, this.#readSet, allFlushedEntities, checkedReads);
 						if (Object.keys(entityTodos).length > 0 || Object.keys(joinRowTodos).length > 0) {
 							await this.driver.flush(this, entityTodos, joinRowTodos);
 							collectCommitRuleTodos(entityTodos, joinRowTodos);
@@ -1035,6 +1039,7 @@ var EntityManager = class EntityManager {
 					}
 					await beforeCommit(this.ctx, allFlushedEntities);
 					await this.#rm.runCommitTransitions();
+					if (this.#readSet.size > 0) await require_flush_ReadDrift.checkReadDrift(this, this.#readSet, allFlushedEntities, checkedReads);
 					if (this.mode === "in-memory-writes") throw new InMemoryRollbackError();
 				});
 				await afterCommit(this.ctx, allFlushedEntities);
@@ -1058,6 +1063,7 @@ var EntityManager = class EntityManager {
 			for (const e of createdThenDeleted) require_BaseEntity.getInstanceData(e).fixupCreatedThenDeleted();
 			this.#merging?.clear();
 			this.#rm.clear();
+			this.#readSet.clear();
 			return [...allFlushedEntities].sort((a, b) => require_BaseEntity.getInstanceData(a).entityIndex - require_BaseEntity.getInstanceData(b).entityIndex);
 		} catch (e) {
 			if (!(e instanceof InMemoryRollbackError)) this.#flushError = e;
@@ -1217,6 +1223,15 @@ var EntityManager = class EntityManager {
 		}
 		return entities;
 	}
+	assertUnchanged(entityOrEntities) {
+		const entities = require_Entity.isEntity(entityOrEntities) ? [entityOrEntities] : entityOrEntities;
+		for (const entity of entities) {
+			if (entity.em !== this) throw new Error("assertUnchanged requires entities from this EntityManager");
+			if (entity.isNewEntity) continue;
+			if (!require_EntityMetadata.getBaseMeta(require_EntityMetadata.getMetadata(entity)).timestampFields?.updatedAt) throw new Error(`assertUnchanged requires updatedAt on ${entity}`);
+			this.#readSet.add(entity);
+		}
+	}
 	touch(entityOrEntities) {
 		for (const entity of require_utils.toArray(entityOrEntities)) require_BaseEntity.getInstanceData(entity).markTouched();
 	}
@@ -1837,7 +1852,7 @@ function maybeBumpUpdatedAt(rm, todos, now) {
 		const { updatedAt } = todo.metadata.timestampFields ?? {};
 		if (updatedAt) for (const e of todo.updates) {
 			const orm = require_BaseEntity.getInstanceData(e);
-			orm.markFieldDirty(updatedAt, require_fields.getField(e, updatedAt));
+			orm.markFieldDirty(updatedAt, require_fields.getField(e, updatedAt, true));
 			const serde = todo.metadata.fields[updatedAt].serde;
 			orm.data[updatedAt] = serde.mapFromNow(now);
 			rm.queueDownstreamReactables(e, updatedAt);