joist-core 2.3.0-next.96 → 2.3.0-next.98

package/build/EntityManager.cjs

@@ -1,60 +1,58 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
 const require_batchloaders_BatchLoader = require("./batchloaders/BatchLoader.cjs");
-const require_scopes = require("./scopes.cjs");
-require("./typeMap.cjs");
-const require_EntityFilter = require("./EntityFilter.cjs");
 require("./relations/Collection.cjs");
-const require_newEntity = require("./newEntity.cjs");
-require("./relations/AbstractRelationImpl.cjs");
 const require_relations_CustomCollection = require("./relations/CustomCollection.cjs");
 const require_relations_CustomReference = require("./relations/CustomReference.cjs");
-const require_relations_hasAsyncMethod = require("./relations/hasAsyncMethod.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_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");
 const require_relations_Reference = require("./relations/Reference.cjs");
 require("./batchloaders/manyToManyBatchLoader.cjs");
-require("./dataloaders/manyToManyFindDataLoader.cjs");
 require("./batchloaders/oneToManyBatchLoader.cjs");
-require("./dataloaders/oneToManyFindDataLoader.cjs");
-const require_IsLoadedCache = require("./IsLoadedCache.cjs");
+const require_queries_find_scopes = require("./queries/find/scopes.cjs");
 const require_relations_OneToManyCollection = require("./relations/OneToManyCollection.cjs");
 const require_relations_ManyToOneReference = require("./relations/ManyToOneReference.cjs");
 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");
-const require_Todo = require("./Todo.cjs");
-const require_logging_ReactionLogger = require("./logging/ReactionLogger.cjs");
-const require_trusted = require("./trusted.cjs");
-const require_ReactionsManager = require("./ReactionsManager.cjs");
-const require_JoinRows = require("./JoinRows.cjs");
-require("./batchloaders/recursiveChildrenBatchLoader.cjs");
-require("./batchloaders/recursiveM2mBatchLoader.cjs");
-require("./batchloaders/recursiveParentsBatchLoader.cjs");
-require("./relations/RecursiveCollection.cjs");
 require("./relations/index.cjs");
-const require_keys = require("./keys.cjs");
-const require_EntityMetadata = require("./EntityMetadata.cjs");
-const require_fields = require("./fields.cjs");
-const require_reactiveHints = require("./reactiveHints.cjs");
-const require_normalizeHints = require("./normalizeHints.cjs");
-const require_loadHints = require("./loadHints.cjs");
 const require_utils = require("./utils.cjs");
+const require_newEntity = require("./newEntity.cjs");
+require("./typeMap.cjs");
+const require_rules = require("./rules.cjs");
+const require_configure = require("./configure.cjs");
+const require_config = require("./config.cjs");
+const require_EntityMetadata = require("./EntityMetadata.cjs");
+const require_trusted = require("./trusted.cjs");
+const require_defaults = require("./defaults.cjs");
 require("./dataloaders/lensDataLoader.cjs");
-const require_loadLens = require("./loadLens.cjs");
+const require_loading_loadLens = require("./loading/loadLens.cjs");
 require("./logging/FactoryLogger.cjs");
 const require_newTestInstance = require("./newTestInstance.cjs");
+const require_queries_find_EntityFilter = require("./queries/find/EntityFilter.cjs");
+const require_flush_JoinRows = require("./flush/JoinRows.cjs");
 const require_PluginManager = require("./PluginManager.cjs");
-const require_QueryParser_collectionJoins = require("./QueryParser.collectionJoins.cjs");
+const require_queries_find_QueryParser_collectionJoins = require("./queries/find/QueryParser.collectionJoins.cjs");
+const require_flush_Todo = require("./flush/Todo.cjs");
 const require_dataloaders_findDataLoader = require("./dataloaders/findDataLoader.cjs");
 require("./drivers/index.cjs");
 const require_logging_FieldLogger = require("./logging/FieldLogger.cjs");
+const require_logging_ReactionLogger = require("./logging/ReactionLogger.cjs");
 require("./plugins/PreloadPlugin.cjs");
-const require_query = require("./query.cjs");
-const require_rules = require("./rules.cjs");
+const require_queries_sql_query = require("./queries/sql/query.cjs");
 const require_upsert = require("./upsert.cjs");
 const require_index = require("./index.cjs");
 require("./batchloaders/enumCollectionBatchLoader.cjs");
@@ -65,15 +63,13 @@ const require_dataloaders_findCountDataLoader = require("./dataloaders/findCount
 const require_dataloaders_findIdsDataLoader = require("./dataloaders/findIdsDataLoader.cjs");
 const require_dataloaders_findOrCreateDataLoader = require("./dataloaders/findOrCreateDataLoader.cjs");
 const require_dataloaders_findPaginatedDataLoader = require("./dataloaders/findPaginatedDataLoader.cjs");
-const require_execute = require("./execute.cjs");
-const require_FlushLock = require("./FlushLock.cjs");
+const require_flush_FlushLock = require("./flush/FlushLock.cjs");
 const require_IndexManager = require("./IndexManager.cjs");
-require("./PendingChanges.cjs");
+const require_loading_IsLoadedCache = require("./loading/IsLoadedCache.cjs");
+const require_queries_sql_execute = require("./queries/sql/execute.cjs");
+const require_reactivity_ReactionsManager = require("./reactivity/ReactionsManager.cjs");
 const require_Entity = require("./Entity.cjs");
 const require_BaseEntity = require("./BaseEntity.cjs");
-const require_defaults = require("./defaults.cjs");
-const require_config = require("./config.cjs");
-const require_configure = require("./configure.cjs");
 let dataloader = require("dataloader");
 dataloader = require_runtime.__toESM(dataloader, 1);
 //#region src/EntityManager.ts
@@ -130,9 +126,9 @@ var EntityManager = class EntityManager {
 	#batchLoaders = {};
 	#joinRows = {};
 	/** Stores any `source -> downstream` reactions to recalc during `em.flush`. */
-	#rm = new require_ReactionsManager.ReactionsManager(this);
+	#rm = new require_reactivity_ReactionsManager.ReactionsManager(this);
 	/** Ensures our `em.flush` method is not interrupted. */
-	#fl = new require_FlushLock.FlushLock();
+	#fl = new require_flush_FlushLock.FlushLock();
 	#hooks = {
 		beforeBegin: [],
 		afterBegin: [],
@@ -141,7 +137,7 @@ var EntityManager = class EntityManager {
 	};
 	#preloader;
 	#fieldLogger = require_logging_FieldLogger.noopFieldLogger;
-	#isLoadedCache = new require_IsLoadedCache.IsLoadedCache();
+	#isLoadedCache = new require_loading_IsLoadedCache.IsLoadedCache();
 	#merging;
 	/** Track `a#1`, `a#2`, etc indexes for `em.create`-d entities. */
 	#createCounter = void 0;
@@ -190,7 +186,7 @@ var EntityManager = class EntityManager {
 				return em.#merging?.has(entity) ?? false;
 			},
 			joinRows(m2m) {
-				return require_utils.getOrSet(em.#joinRows, m2m.joinTableName, () => new require_JoinRows.JoinRows(m2m, em.#rm));
+				return require_utils.getOrSet(em.#joinRows, m2m.joinTableName, () => new require_flush_JoinRows.JoinRows(m2m, em.#rm));
 			},
 			/** Returns `a:1.books` if it's in our preload cache. */
 			getPreloadedRelation(taggedId, fieldName) {
@@ -289,7 +285,7 @@ var EntityManager = class EntityManager {
 	async find(type, where, options) {
 		this.#assertFindAllowed("find");
 		const { populate, ...rest } = options || {};
-		const normalized = require_EntityFilter.mergeFindOptions(where, rest);
+		const normalized = require_queries_find_EntityFilter.mergeFindOptions(where, rest);
 		const settings = {
 			where: normalized.where,
 			...normalized.options
@@ -304,7 +300,7 @@ var EntityManager = class EntityManager {
 		this.#assertFindAllowed("query");
 		const em = this;
 		return (async function query() {
-			const plan = require_query.parseUserQuery(q);
+			const plan = require_queries_sql_query.parseUserQuery(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);
@@ -317,17 +313,17 @@ var EntityManager = class EntityManager {
 	execute(statement) {
 		const em = this;
 		return (async function execute() {
-			if (require_execute.isMutation(statement)) {
+			if (require_queries_sql_execute.isMutation(statement)) {
 				em.__api.checkWritesAllowed();
 				if (em.mode === "in-memory-writes") require_utils.fail("SQL mutations do not support in-memory-writes mode");
 			} else em.#assertFindAllowed("execute");
-			const plan = require_execute.parseStatement(statement);
+			const plan = require_queries_sql_execute.parseStatement(statement);
 			if (!plan) return {
 				rowCount: 0,
 				rows: []
 			};
 			const result = await em.driver.executeQuery(em, plan.sql, plan.bindings);
-			return require_execute.decodeStatementResult(em, plan, result);
+			return require_queries_sql_execute.decodeStatementResult(em, plan, result);
 		})().catch(function execute(err) {
 			throw appendStack(err, /* @__PURE__ */ new Error());
 		});
@@ -383,7 +379,7 @@ var EntityManager = class EntityManager {
 		const { checkLimit, ...findSettings } = settings;
 		const { pluginManager } = getEmInternalApi(this);
 		pluginManager.beforeFind(meta, operation, parsed, findSettings);
-		require_QueryParser_collectionJoins.optimizeCollectionJoins(parsed, settings);
+		require_queries_find_QueryParser_collectionJoins.optimizeCollectionJoins(parsed, settings);
 		return {
 			checkLimit,
 			findSettings
@@ -444,7 +440,7 @@ var EntityManager = class EntityManager {
 		let count = await require_dataloaders_findCountDataLoader.findCountDataLoader(this, type, settings).catch(function findCount(err) {
 			throw appendStack(err, /* @__PURE__ */ new Error());
 		});
-		if (require_scopes.isSelectAllFilter(where, options.conditions)) {
+		if (require_queries_find_scopes.isSelectAllFilter(where, options.conditions)) {
 			const tagged = this.#entitiesByTag.get(require_EntityMetadata.getMetadata(type).tagName) ?? [];
 			for (const entity of tagged) if (entity instanceof type) {
 				if (entity.isNewEntity) count++;
@@ -751,7 +747,7 @@ var EntityManager = class EntityManager {
 		return entities;
 	}
 	async loadLens(entities, fn, populate) {
-		const result = await require_loadLens.loadLens(entities, fn);
+		const result = await require_loading_loadLens.loadLens(entities, fn);
 		if (populate) await this.populate(result, populate);
 		return result;
 	}
@@ -778,7 +774,7 @@ var EntityManager = class EntityManager {
 			return e !== void 0 && !require_BaseEntity.getInstanceData(e).isDeletedAndFlushed;
 		});
 		if (list.length === 0) return !fn ? entityOrList : fn(entityOrList);
-		if (!opts.forceReload && list.every((entity) => !entity.isNewEntity && require_loadHints.isLoadedForPopulate(entity, hintOpt))) return fn ? fn(entityOrList) : entityOrList;
+		if (!opts.forceReload && list.every((entity) => !entity.isNewEntity && require_loading_loadHints.isLoadedForPopulate(entity, hintOpt))) return fn ? fn(entityOrList) : entityOrList;
 		const meta = require_EntityMetadata.getMetadata(list[0]);
 		if (this.#preloader) {
 			const [preload, non] = this.#preloader.partitionHint(meta, hintOpt);
@@ -828,7 +824,7 @@ var EntityManager = class EntityManager {
 	async assignNewIds() {
 		let pendingEntities = this.entities.filter((e) => e.isNewEntity && !e.isDeletedEntity && !e.idTaggedMaybe);
 		await this.getLoader("assign-new-ids", "global", async (entities) => {
-			let todos = require_Todo.createTodos(entities);
+			let todos = require_flush_Todo.createTodos(entities);
 			await this.driver.assignNewIds(this, todos);
 			for (const e of entities) this.#entitiesById.set(e.idTagged, e);
 			return entities;
@@ -894,10 +890,10 @@ var EntityManager = class EntityManager {
 				const pendingHooks = /* @__PURE__ */ new Set();
 				const alreadyRanHooks = /* @__PURE__ */ new Set();
 				findPendingFlushEntities(this.#maybePendingFlushEntities, hooksInvoked, pendingFlush, pendingHooks, alreadyRanHooks);
-				if (alreadyRanHooks.size > 0) maybeBumpUpdatedAt(this.#rm, require_Todo.createTodos(alreadyRanHooks), now);
+				if (alreadyRanHooks.size > 0) maybeBumpUpdatedAt(this.#rm, require_flush_Todo.createTodos(alreadyRanHooks), now);
 				while (pendingHooks.size > 0) await this.#fl.allowWrites(async () => {
-					let todos = require_Todo.createTodos(pendingHooks);
-					await require_defaults.setAsyncDefaults(suppressedDefaultTypeErrors, this.ctx, require_Todo.Todo.groupInsertsByTypeAndSubType(todos));
+					let todos = require_flush_Todo.createTodos(pendingHooks);
+					await require_defaults.setAsyncDefaults(suppressedDefaultTypeErrors, this.ctx, require_flush_Todo.Todo.groupInsertsByTypeAndSubType(todos));
 					maybeBumpUpdatedAt(this.#rm, todos, now);
 					for (const group of maybeSetupHookOrdering(todos)) {
 						await beforeCreate(this.ctx, group);
@@ -971,7 +967,7 @@ var EntityManager = class EntityManager {
 						"deletes"
 					]) for (const e of todo[key]) if (!commitRuleSeen.has(e)) {
 						commitRuleSeen.add(e);
-						require_Todo.getTodo(commitRuleTodos, e)[key].push(e);
+						require_flush_Todo.getTodo(commitRuleTodos, e)[key].push(e);
 					}
 				}
 				for (const [table, todo] of Object.entries(joinRowTodos)) {
@@ -989,8 +985,8 @@ var EntityManager = class EntityManager {
 			}
 			let entitiesToFlush = await runHooksOnPendingEntities();
 			for (const e of entitiesToFlush) allFlushedEntities.add(e);
-			let entityTodos = require_Todo.createTodos(entitiesToFlush);
-			let joinRowTodos = require_Todo.combineJoinRows(this.#joinRows);
+			let entityTodos = require_flush_Todo.createTodos(entitiesToFlush);
+			let joinRowTodos = require_flush_Todo.combineJoinRows(this.#joinRows);
 			await runValidation(entityTodos, joinRowTodos, !skipValidation);
 			this.#rm.throwIfAnySuppressedTypeErrors();
 			if (suppressedDefaultTypeErrors.length > 0) throw suppressedDefaultTypeErrors[0];
@@ -1014,8 +1010,8 @@ var EntityManager = class EntityManager {
 							now = getNow();
 							entitiesToFlush = await runHooksOnPendingEntities();
 							for (const e of entitiesToFlush) allFlushedEntities.add(e);
-							entityTodos = require_Todo.createTodos(entitiesToFlush);
-							joinRowTodos = require_Todo.combineJoinRows(this.#joinRows);
+							entityTodos = require_flush_Todo.createTodos(entitiesToFlush);
+							joinRowTodos = require_flush_Todo.combineJoinRows(this.#joinRows);
 							await runValidation(entityTodos, joinRowTodos, true);
 							this.#rm.throwIfAnySuppressedTypeErrors();
 						} else entityTodos = {};
@@ -1289,7 +1285,7 @@ var EntityManager = class EntityManager {
 		while (entities.length > 0) {
 			const p = entities.flatMap(getCascadeDeleteRelations).map((r) => r.load().then(() => r.maybeCascadeDelete()));
 			await Promise.all(p);
-			const todos = require_Todo.createTodos(entities);
+			const todos = require_flush_Todo.createTodos(entities);
 			await beforeDelete(this.ctx, todos);
 			for (const entity of entities) {
 				const relations = require_index.getRelations(entity);
@@ -1447,7 +1443,7 @@ var EntityManager = class EntityManager {
 		if (source.isDirtyEntity) require_utils.fail("cannot import dirty entities");
 		hint ??= {};
 		if (!normalizedHint) {
-			require_loadHints.assertLoaded(source, hint);
+			require_loading_loadHints.assertLoaded(source, hint);
 			normalizedHint = require_normalizeHints.deepNormalizeHint(hint);
 		}
 		if (source.em === this) return source;
@@ -1581,7 +1577,7 @@ async function validateReactiveRules(em, logger, todos, joinRowTodos, getRules =
 	const walks = [];
 	async function followAndQueue(triggered, rule) {
 		if (triggered.length === 0) return;
-		const found = (await require_reactiveHints.followReverseHint(rule.name, triggered, rule.path)).filter((entity) => !entity.isDeletedEntity).filter((e) => e instanceof rule.cstr);
+		const found = (await require_reactivity_reactiveHints.followReverseHint(rule.name, triggered, rule.path)).filter((entity) => !entity.isDeletedEntity).filter((e) => e instanceof rule.cstr);
 		let entities = fns.get(rule.fn);
 		if (!entities) {
 			entities = /* @__PURE__ */ new Set();