joist-core 2.4.0-next.2 → 2.4.0-next.20

package/build/EntityManager.cjs

@@ -4,15 +4,9 @@ const require_batchloaders_BatchLoader = require("./batchloaders/BatchLoader.cjs
 require("./relations/Collection.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");
@@ -28,13 +22,19 @@ 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");
 require("./typeMap.cjs");
 const require_rules = require("./rules.cjs");
-const require_configure = require("./configure.cjs");
 const require_config = require("./config.cjs");
+const require_configure = require("./configure.cjs");
 const require_EntityMetadata = require("./EntityMetadata.cjs");
 const require_trusted = require("./trusted.cjs");
 const require_defaults = require("./defaults.cjs");
@@ -109,6 +109,8 @@ var EntityManager = class EntityManager {
 	#entitiesByTag = /* @__PURE__ */ new Map();
 	#indexManager = new require_IndexManager.IndexManager();
 	#isValidating = false;
+	/** The error that failed a previous `em.flush`, after which this EntityManager can't flush again. */
+	#flushError = void 0;
 	#findRestricted = false;
 	#pendingPercolate = /* @__PURE__ */ new Map();
 	#preloadedRelations = /* @__PURE__ */ new Map();
@@ -300,7 +302,7 @@ var EntityManager = class EntityManager {
 		this.#assertFindAllowed("query");
 		const em = this;
 		return (async function query() {
-			const plan = require_queries_sql_query.parseUserQuery(q);
+			const plan = require_queries_sql_query.parseRootQuery(q);
 			if (options?.populate && plan.output.kind !== "entity") require_utils.fail("em.query populate requires an entity selection");
 			const { rows } = await em.driver.executeQuery(em, plan.sql, plan.bindings);
 			const result = plan.decodeRows(em, rows);
@@ -866,6 +868,7 @@ var EntityManager = class EntityManager {
 	}
 	async #flush(flushOptions = {}) {
 		if (this.mode === "read-only") throw new ReadOnlyError();
+		if (this.#flushError !== void 0) throw new FailedFlushError(this.#flushError);
 		const { skipValidation = false } = flushOptions;
 		this.#fl.startLock();
 		const allFlushedEntities = /* @__PURE__ */ new Set();
@@ -990,7 +993,7 @@ 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) {
+			if (Object.keys(entityTodos).length > 0 || Object.keys(joinRowTodos).length > 0 || this.#rm.hasPendingCommitTransitions()) {
 				await this.driver.transaction(this, async () => {
 					do {
 						if (Object.keys(entityTodos).length > 0 || Object.keys(joinRowTodos).length > 0) {
@@ -1021,6 +1024,7 @@ var EntityManager = class EntityManager {
 						await runCommitValidation(commitRuleTodos, commitRuleJoinRowTodos);
 					}
 					await beforeCommit(this.ctx, allFlushedEntities);
+					await this.#rm.runCommitTransitions();
 					if (this.mode === "in-memory-writes") throw new InMemoryRollbackError();
 				});
 				await afterCommit(this.ctx, allFlushedEntities);
@@ -1040,12 +1044,13 @@ var EntityManager = class EntityManager {
 				this.#dataloaders = {};
 				this.#batchLoaders = {};
 				this.#preloadedRelations = /* @__PURE__ */ new Map();
-				this.#rm.clear();
 			}
 			for (const e of createdThenDeleted) require_BaseEntity.getInstanceData(e).fixupCreatedThenDeleted();
 			this.#merging?.clear();
+			this.#rm.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;
 			if (e instanceof require_relations_RecursiveCycleError.RecursiveCycleError) {
 				const entity = e.entities[0];
 				for (const meta of require_EntityMetadata.getBaseAndSelfMetas(require_EntityMetadata.getMetadata(entity))) {
@@ -1326,6 +1331,7 @@ var EntityManager = class EntityManager {
 		} else throw new Error("Unsupported override for setFieldLogging");
 	}
 	async [Symbol.asyncDispose]() {
+		if (this.#flushError !== void 0) return;
 		await this.flush();
 	}
 	/** Returns entities matching the filter using indexed search when available. */
@@ -1861,6 +1867,12 @@ function hasPaginationSettings(options) {
 }
 /** An error we throw to get knex to `ROLLBACK`, but then catch. */
 var InMemoryRollbackError = class extends Error {};
+/** An error thrown by `em.flush` after a previous `em.flush` on the same EntityManager failed. */
+var FailedFlushError = class extends Error {
+	constructor(cause) {
+		super("EntityManager cannot flush after a previous flush failed, use a new EntityManager", { cause });
+	}
+};
 /** An error thrown when `em.mode === "read-only"` but entities are mutated/flushed. */
 var ReadOnlyError = class extends Error {
 	constructor() {
@@ -1912,6 +1924,7 @@ function createRowFromEntityData(e, opts = {}) {
 }
 //#endregion
 exports.EntityManager = EntityManager;
+exports.FailedFlushError = FailedFlushError;
 exports.NotFoundError = NotFoundError;
 exports.ReadOnlyError = ReadOnlyError;
 exports.TooManyError = TooManyError;
@@ -1923,6 +1936,7 @@ exports.driverBeforeBegin = driverBeforeBegin;
 exports.driverBeforeCommit = driverBeforeCommit;
 exports.getDefaultEntityLimit = getDefaultEntityLimit;
 exports.getEmInternalApi = getEmInternalApi;
+exports.invokeRule = invokeRule;
 exports.isDefined = isDefined;
 exports.isId = isId;
 exports.isKey = isKey;