joist-core 2.3.0 → 2.4.0

package/build/batchloaders/populateBatchLoader.js

@@ -1,209 +1,153 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.populateOperation = void 0;
-exports.populateBatchLoader = populateBatchLoader;
-const HintTree_1 = require("../HintTree");
-const index_1 = require("../index");
-const normalizeHints_1 = require("../normalizeHints");
-const reactiveHints_1 = require("../reactiveHints");
-const ReactiveField_1 = require("../relations/ReactiveField");
-const utils_1 = require("../utils");
-const loadBatchLoader_1 = require("./loadBatchLoader");
-const manyToManyBatchLoader_1 = require("./manyToManyBatchLoader");
-const oneToManyBatchLoader_1 = require("./oneToManyBatchLoader");
-const oneToOneBatchLoader_1 = require("./oneToOneBatchLoader");
-exports.populateOperation = "populate";
+import "./BatchLoader.js";
+import { hintKey } from "../normalizeHints.js";
+import { getRelationFromMaybePolyKey, isPolyHint } from "../reactivity/reactiveHints.js";
+import { keyToNumber } from "../keys.js";
+import { kqDot } from "../queries/sql/keywords.js";
+import { manyToManyBatchLoader } from "./manyToManyBatchLoader.js";
+import { oneToManyBatchLoader } from "./oneToManyBatchLoader.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
+import { oneToOneBatchLoader } from "./oneToOneBatchLoader.js";
+import { ReactiveFieldImpl } from "../relations/ReactiveField.js";
+import { indexBy, toArray } from "../utils.js";
+import "../EntityMetadata.js";
+import { AliasAssigner } from "../queries/sql/AliasAssigner.js";
+import { buildHintTree } from "../loading/HintTree.js";
+import "../index.js";
+import { loadBatchLoader } from "./loadBatchLoader.js";
+import { getEmInternalApi } from "../EntityManager.js";
+import "../Entity.js";
+//#region src/batchloaders/populateBatchLoader.ts
+const populateOperation = "populate";
 function populateBatchLoader(em, meta, hint, mode, opts = {}) {
-    // For batching populates, we want different levels of course-ness:
-    // - preloading populates that are only SQL should be batched together as much as possible, but
-    // - intermixed populates (some with custom relations) should be batched as separately as possible
-    //   (while still batching identical populates together) to reduce the chance of promise deadlocks.
-    //
-    // I.e. if we know this is a sql-only hint, we can batch all loads for a given entity
-    // together do leverage join-based preloading.
-    //
-    // However, intermixed batches can be prone to promise deadlocking (one relation .load getting
-    // stuck in a batch that is asking for its own dependencies to load), so if this is an intermixed
-    // hint, then use a batch key that includes the hint itself, which will make it unlikely
-    // for non-sql relations to deadlock on each other/themselves.
-    const batchKey = mode === "preload" ? `${meta.tagName}:${opts.forceReload}` : `${meta.tagName}:${(0, normalizeHints_1.hintKey)(hint)}:${opts.forceReload}`;
-    return em.getBatchLoader(exports.populateOperation, batchKey, async (populates) => {
-        async function populateLayer(layerMeta, layerNode) {
-            // Skip join-based preloading if nothing in this layer needs loading. If any entity in the list
-            // needs loading, just load everything
-            const { preloader } = (0, index_1.getEmInternalApi)(em);
-            // We may not have a layerMeta if we're going through non-field properties
-            if (preloader && layerMeta) {
-                const preloadThisLayer = Object.entries(layerNode.hints).some(([key, hint]) => {
-                    for (const entity of hint.entities) {
-                        if (entity[key]?.isLoaded === false && !entity[key]?.isPreloaded)
-                            return true;
-                    }
-                    return false;
-                });
-                if (preloadThisLayer) {
-                    // Do an up-front SQL call of `select id, ...preloads... from table`,
-                    const assigner = new index_1.AliasAssigner();
-                    const meta = layerMeta;
-                    const alias = assigner.getAlias(meta.tableName);
-                    const entities = [...layerNode.entities].filter((e) => !e.isNewEntity);
-                    const ids = entities.map((e) => (0, index_1.keyToNumber)(meta, e.id));
-                    // Create a ParsedFindQuery for `addPreloading` to inject joins into
-                    const query = {
-                        // We already have the entities loaded, so can do just `SELECT a.id` + the preload columns
-                        selects: [(0, index_1.kqDot)(alias, "id")],
-                        tables: [{ alias, join: "primary", table: meta.tableName }],
-                        condition: {
-                            kind: "exp",
-                            op: "and",
-                            conditions: [
-                                { kind: "column", alias, column: "id", dbType: meta.idDbType, cond: { kind: "in", value: ids } },
-                            ],
-                        },
-                        orderBys: [],
-                    };
-                    // If we're selecting from small_publishers, join in our base class in case
-                    // the preloader wants to join on a column like `publishers.group_id`
-                    (0, index_1.addTablePerClassJoinsAndClassTag)(query, meta, alias, false);
-                    const hydrator = preloader.addPreloading(meta, layerNode, query);
-                    if (hydrator) {
-                        const rows = await em["executeFind"](meta, exports.populateOperation, query, {});
-                        const entitiesById = (0, index_1.indexBy)(entities, (e) => (0, index_1.keyToNumber)(meta, e.id));
-                        const entitiesInOrder = rows.map((row) => entitiesById.get(row["id"]));
-                        hydrator(rows, entitiesInOrder);
-                    }
-                }
-            }
-            // First pass: batch SQL relations directly, fall back to relation.load() for non-SQL
-            const batchPromises = new Set();
-            const relationsToPreload = [];
-            const fallbackPromises = [];
-            for (const [key, tree] of Object.entries(layerNode.hints)) {
-                const field = layerMeta?.allFields[key];
-                let oneToManyLoader;
-                let oneToManyPromise;
-                let manyToManyLoader;
-                let manyToManyPromise;
-                let oneToOneLoader;
-                let oneToOnePromise;
-                let manyToOneLoader;
-                let manyToOnePromise;
-                for (const entity of tree.entities) {
-                    const relation = (0, reactiveHints_1.getRelationFromMaybePolyKey)(entity, key);
-                    // This happens to let through non-relation hints like 'name' on user, which wasn't intentional,
-                    // but currently doesn't blow up (somehow), and is depended on by internal tests.
-                    if (!relation || typeof relation.load !== "function") {
-                        // We don't want to throw on poly hints, because they're not actually loaded on the entity
-                        if ((0, reactiveHints_1.isPolyHint)(key))
-                            continue;
-                        throw new Error(`Invalid load hint '${key}' on ${entity}`);
-                    }
-                    // If we're populating a hasReactiveField, don't bother loading it
-                    // if it's already been calculated (i.e. we have no reason to believe its value
-                    // is stale, so we should avoid pulling all of its data into memory).
-                    //
-                    // (Note that we can't do this same optimization for ReactiveReferenceImpl, because
-                    // as a FK, it will always need at least some `.load()` to fetch its entity from the database.
-                    // So we go ahead and call `.load()`, assuming it will just load its cached value, but it
-                    // will also check internally if it's marked for recalc, and load its load hint if necessary.
-                    if (relation instanceof ReactiveField_1.ReactiveFieldImpl && relation.isSet)
-                        continue;
-                    if (relation.isLoaded && !opts.forceReload)
-                        continue;
-                    if (relation.isPreloaded) {
-                        relation.preload();
-                        continue;
-                    }
-                    // For non-derived SQL relations on existing entities, use batch loaders directly
-                    // (1 shared promise per batch instead of per-entity async overhead).
-                    // Skip new entities (no id) and derived relations (reactive m2m/m2o have extra logic in load).
-                    if (!entity.isNewEntity && field) {
-                        if (field.kind === "o2m") {
-                            oneToManyPromise = (oneToManyLoader ??= (0, oneToManyBatchLoader_1.oneToManyBatchLoader)(em, relation)).load(entity.idTagged);
-                            relationsToPreload.push(relation);
-                            continue;
-                        }
-                        else if (field.kind === "m2m" && !field.derived) {
-                            manyToManyPromise = (manyToManyLoader ??= (0, manyToManyBatchLoader_1.manyToManyBatchLoader)(em, relation)).load(`${relation.columnName}=${entity.id}`);
-                            relationsToPreload.push(relation);
-                            continue;
-                        }
-                        else if (field.kind === "o2o") {
-                            oneToOnePromise = (oneToOneLoader ??= (0, oneToOneBatchLoader_1.oneToOneBatchLoader)(em, relation)).load(entity.idTagged);
-                            relationsToPreload.push(relation);
-                            continue;
-                        }
-                        else if (field.kind === "m2o" && !field.derived) {
-                            const taggedId = relation.idTaggedMaybe;
-                            if (taggedId) {
-                                manyToOnePromise = (manyToOneLoader ??= (0, loadBatchLoader_1.loadBatchLoader)(em, field.otherMetadata())).load({
-                                    taggedId,
-                                    hint: undefined,
-                                });
-                                relationsToPreload.push(relation);
-                                continue;
-                            }
-                        }
-                    }
-                    fallbackPromises.push(relation.load(opts));
-                }
-                if (oneToManyPromise)
-                    batchPromises.add(oneToManyPromise);
-                if (manyToManyPromise)
-                    batchPromises.add(manyToManyPromise);
-                if (oneToOnePromise)
-                    batchPromises.add(oneToOnePromise);
-                if (manyToOnePromise)
-                    batchPromises.add(manyToOnePromise);
-            }
-            if (batchPromises.size > 0 || fallbackPromises.length > 0) {
-                await Promise.all([Promise.all(batchPromises), Promise.all(fallbackPromises)]);
-            }
-            for (const relation of relationsToPreload) {
-                relation.preload();
-            }
-            // 2nd breadth-width pass to do nested load hints, this will fan out at the sibling level.
-            // i.e. populateLayer(...reviews...) & populateLayer(...comments...)
-            let nestedLoadPromises;
-            for (const [key, tree] of Object.entries(layerNode.hints)) {
-                if (Object.keys(tree.hints).length === 0)
-                    continue;
-                // Get the children we found, i.e. [a1, a2, a3] -> all of their books
-                const childrenByParent = new Map();
-                for (const entity of tree.entities) {
-                    const relation = (0, reactiveHints_1.getRelationFromMaybePolyKey)(entity, key);
-                    childrenByParent.set(entity, relation ? (0, utils_1.toArray)(getEvenDeleted(relation)) : []);
-                }
-                if (childrenByParent.size === 0)
-                    continue;
-                // Rewrite our node.entities to be the next layer of children, i.e. children will be all books, for all of
-                // `[a1, a2, a3]`, but only the books of `a2` need to recurse into `book: reviews` and only the books of
-                // `a3` need to recurse into `book: comments`, so swap `node.entities` (which is currently authors)
-                // with the books. This is what prevents our dataloader-merged TreeHint from over-fetching and loading
-                // the superset load hint for all entities.
-                function rewrite(node) {
-                    const next = new Set();
-                    for (const entity of node.entities) {
-                        const children = childrenByParent.get(entity);
-                        if (children)
-                            for (const child of children)
-                                next.add(child);
-                    }
-                    node.entities = next;
-                    Object.values(node.hints).forEach((node) => rewrite(node));
-                }
-                rewrite(tree);
-                const nextMeta = layerMeta?.allFields[key]?.otherMetadata?.();
-                (nestedLoadPromises ??= []).push(populateLayer(nextMeta, tree));
-            }
-            if (nestedLoadPromises)
-                await Promise.all(nestedLoadPromises);
-        }
-        await populateLayer(meta, (0, HintTree_1.buildHintTree)(populates));
-    });
+	const batchKey = mode === "preload" ? `${meta.tagName}:${opts.forceReload}` : `${meta.tagName}:${hintKey(hint)}:${opts.forceReload}`;
+	return em.getBatchLoader(populateOperation, batchKey, async (populates) => {
+		async function populateLayer(layerMeta, layerNode) {
+			const { preloader } = getEmInternalApi(em);
+			if (preloader && layerMeta) {
+				if (Object.entries(layerNode.hints).some(([key, hint]) => {
+					for (const entity of hint.entities) if (entity[key]?.isLoaded === false && !entity[key]?.isPreloaded) return true;
+					return false;
+				})) {
+					const assigner = new AliasAssigner();
+					const meta = layerMeta;
+					const alias = assigner.getAlias(meta.tableName);
+					const entities = [...layerNode.entities].filter((e) => !e.isNewEntity);
+					const ids = entities.map((e) => keyToNumber(meta, e.id));
+					const query = {
+						selects: [kqDot(alias, "id")],
+						tables: [{
+							alias,
+							join: "primary",
+							table: meta.tableName
+						}],
+						condition: {
+							kind: "exp",
+							op: "and",
+							conditions: [{
+								kind: "column",
+								alias,
+								column: "id",
+								dbType: meta.idDbType,
+								cond: {
+									kind: "in",
+									value: ids
+								}
+							}]
+						},
+						orderBys: []
+					};
+					addTablePerClassJoinsAndClassTag(query, meta, alias, false);
+					const hydrator = preloader.addPreloading(meta, layerNode, query);
+					if (hydrator) {
+						const rows = await em["executeFind"](meta, populateOperation, query, {});
+						const entitiesById = indexBy(entities, (e) => keyToNumber(meta, e.id));
+						hydrator(rows, rows.map((row) => entitiesById.get(row["id"])));
+					}
+				}
+			}
+			const batchPromises = /* @__PURE__ */ new Set();
+			const relationsToPreload = [];
+			const fallbackPromises = [];
+			for (const [key, tree] of Object.entries(layerNode.hints)) {
+				const field = layerMeta?.allFields[key];
+				const isPoly = isPolyHint(key);
+				let loader;
+				let batchPromise;
+				for (const entity of tree.entities) {
+					const relation = isPoly ? getRelationFromMaybePolyKey(entity, key) : entity[key];
+					if (!relation || typeof relation.load !== "function") {
+						if (isPoly) continue;
+						throw new Error(`Invalid load hint '${key}' on ${entity}`);
+					}
+					if (relation instanceof ReactiveFieldImpl && relation.isSet) continue;
+					if (relation.isLoaded && !opts.forceReload) continue;
+					if (relation.isPreloaded) {
+						relation.preload();
+						continue;
+					}
+					if (!entity.isNewEntity && field) {
+						if (field.kind === "o2m") {
+							batchPromise = (loader ??= oneToManyBatchLoader(em, relation)).load(entity.idTagged);
+							relationsToPreload.push(relation);
+							continue;
+						} else if (field.kind === "m2m" && !field.derived) {
+							batchPromise = (loader ??= manyToManyBatchLoader(em, relation)).load(`${relation.columnName}=${entity.id}`);
+							relationsToPreload.push(relation);
+							continue;
+						} else if (field.kind === "o2o") {
+							batchPromise = (loader ??= oneToOneBatchLoader(em, relation)).load(entity.idTagged);
+							relationsToPreload.push(relation);
+							continue;
+						} else if (field.kind === "m2o" && !field.derived) {
+							const taggedId = relation.idTaggedMaybe;
+							if (taggedId) {
+								batchPromise = (loader ??= loadBatchLoader(em, field.otherMetadata())).load({
+									taggedId,
+									hint: void 0
+								});
+								relationsToPreload.push(relation);
+								continue;
+							}
+						}
+					}
+					fallbackPromises.push(relation.load(opts));
+				}
+				if (batchPromise) batchPromises.add(batchPromise);
+			}
+			if (batchPromises.size > 0 || fallbackPromises.length > 0) await Promise.all([Promise.all(batchPromises), Promise.all(fallbackPromises)]);
+			for (const relation of relationsToPreload) relation.preload();
+			let nestedLoadPromises;
+			for (const [key, tree] of Object.entries(layerNode.hints)) {
+				if (Object.keys(tree.hints).length === 0) continue;
+				const childrenByParent = /* @__PURE__ */ new Map();
+				for (const entity of tree.entities) {
+					const relation = getRelationFromMaybePolyKey(entity, key);
+					childrenByParent.set(entity, relation ? toArray(getEvenDeleted(relation)) : []);
+				}
+				if (childrenByParent.size === 0) continue;
+				function rewrite(node) {
+					const next = /* @__PURE__ */ new Set();
+					for (const entity of node.entities) {
+						const children = childrenByParent.get(entity);
+						if (children) for (const child of children) next.add(child);
+					}
+					node.entities = next;
+					Object.values(node.hints).forEach((node) => rewrite(node));
+				}
+				rewrite(tree);
+				const nextMeta = (layerMeta?.allFields[key])?.otherMetadata?.();
+				(nestedLoadPromises ??= []).push(populateLayer(nextMeta, tree));
+			}
+			if (nestedLoadPromises) await Promise.all(nestedLoadPromises);
+		}
+		await populateLayer(meta, buildHintTree(populates));
+	});
 }
 /** Probes `relation` to see if it's a m2o/o2m/m2m relation that supports `getWithDeleted`, otherwise calls `get`. */
 function getEvenDeleted(relation) {
-    return "getWithDeleted" in relation ? relation.getWithDeleted : relation.get;
+	return "getWithDeleted" in relation ? relation.getWithDeleted : relation.get;
 }
+//#endregion
+export { populateBatchLoader, populateOperation };
+
 //# sourceMappingURL=populateBatchLoader.js.map

package/build/batchloaders/populateBatchLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"populateBatchLoader.js","sourceRoot":"","sources":["../../src/batchloaders/populateBatchLoader.ts"],"names":[],"mappings":";;;AA0BA,kDAgMC;AAxND,0CAAsD;AACtD,oCASkB;AAElB,sDAA4C;AAC5C,oDAA2E;AAC3E,8DAA+D;AAC/D,oCAAmC;AAEnC,uDAAoD;AACpD,mEAAgE;AAChE,iEAA8D;AAC9D,+DAA4D;AAE/C,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAE5C,SAAgB,mBAAmB,CACjC,EAAiB,EACjB,IAAoB,EACpB,IAAmB,EACnB,IAA8B,EAC9B,OAAkC,EAAE;IAEpC,mEAAmE;IACnE,+FAA+F;IAC/F,kGAAkG;IAClG,mGAAmG;IACnG,EAAE;IACF,qFAAqF;IACrF,8CAA8C;IAC9C,EAAE;IACF,8FAA8F;IAC9F,iGAAiG;IACjG,wFAAwF;IACxF,8DAA8D;IAC9D,MAAM,QAAQ,GACZ,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAA,wBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;IACtH,OAAO,EAAE,CAAC,cAAc,CAAC,yBAAiB,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QACxE,KAAK,UAAU,aAAa,CAAC,SAAqC,EAAE,SAA2B;YAC7F,+FAA+F;YAC/F,sCAAsC;YACtC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,wBAAgB,EAAC,EAAE,CAAC,CAAC;YAC3C,0EAA0E;YAC1E,IAAI,SAAS,IAAI,SAAS,EAAE,CAAC;gBAC3B,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;oBAC5E,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;wBACnC,IAAK,MAAc,CAAC,GAAG,CAAC,EAAE,QAAQ,KAAK,KAAK,IAAI,CAAE,MAAc,CAAC,GAAG,CAAC,EAAE,WAAW;4BAAE,OAAO,IAAI,CAAC;oBAClG,CAAC;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC,CAAC;gBACH,IAAI,gBAAgB,EAAE,CAAC;oBACrB,qEAAqE;oBACrE,MAAM,QAAQ,GAAG,IAAI,qBAAa,EAAE,CAAC;oBACrC,MAAM,IAAI,GAAG,SAAS,CAAC;oBACvB,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAChD,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;oBACvE,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,mBAAW,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBACzD,oEAAoE;oBACpE,MAAM,KAAK,GAAoB;wBAC7B,0FAA0F;wBAC1F,OAAO,EAAE,CAAC,IAAA,aAAK,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;wBAC7B,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;wBAC3D,SAAS,EAAE;4BACT,IAAI,EAAE,KAAK;4BACX,EAAE,EAAE,KAAK;4BACT,UAAU,EAAE;gCACV,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;6BACjG;yBACF;wBACD,QAAQ,EAAE,EAAE;qBACb,CAAC;oBACF,2EAA2E;oBAC3E,qEAAqE;oBACrE,IAAA,wCAAgC,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC5D,MAAM,QAAQ,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;oBACjE,IAAI,QAAQ,EAAE,CAAC;wBACb,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,yBAAiB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;wBACzE,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,mBAAW,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBACvE,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBACvE,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;oBAClC,CAAC;gBACH,CAAC;YACH,CAAC;YAED,qFAAqF;YACrF,MAAM,aAAa,GAAG,IAAI,GAAG,EAAiB,CAAC;YAC/C,MAAM,kBAAkB,GAA0B,EAAE,CAAC;YACrD,MAAM,gBAAgB,GAAiC,EAAE,CAAC;YAE1D,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1D,MAAM,KAAK,GAAG,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;gBACxC,IAAI,eAAoE,CAAC;gBACzE,IAAI,gBAA2C,CAAC;gBAChD,IAAI,gBAAsE,CAAC;gBAC3E,IAAI,iBAA4C,CAAC;gBACjD,IAAI,cAAkE,CAAC;gBACvE,IAAI,eAA0C,CAAC;gBAC/C,IAAI,eAA+D,CAAC;gBACpE,IAAI,gBAA2C,CAAC;gBAChD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnC,MAAM,QAAQ,GAAG,IAAA,2CAA2B,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;oBAC1D,gGAAgG;oBAChG,iFAAiF;oBACjF,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBACrD,0FAA0F;wBAC1F,IAAI,IAAA,0BAAU,EAAC,GAAG,CAAC;4BAAE,SAAS;wBAC9B,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,QAAQ,MAAM,EAAE,CAAC,CAAC;oBAC7D,CAAC;oBAED,kEAAkE;oBAClE,+EAA+E;oBAC/E,qEAAqE;oBACrE,EAAE;oBACF,mFAAmF;oBACnF,8FAA8F;oBAC9F,yFAAyF;oBACzF,6FAA6F;oBAC7F,IAAI,QAAQ,YAAY,iCAAiB,IAAI,QAAQ,CAAC,KAAK;wBAAE,SAAS;oBACtE,IAAI,QAAQ,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW;wBAAE,SAAS;oBACrD,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;wBACzB,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACnB,SAAS;oBACX,CAAC;oBAED,iFAAiF;oBACjF,qEAAqE;oBACrE,+FAA+F;oBAC/F,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,KAAK,EAAE,CAAC;wBACjC,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;4BACzB,gBAAgB,GAAG,CAAC,eAAe,KAAK,IAAA,2CAAoB,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,CAAC;4BACnG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;4BAClC,SAAS;wBACX,CAAC;6BAAM,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;4BAClD,iBAAiB,GAAG,CAAC,gBAAgB,KAAK,IAAA,6CAAqB,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CACjF,GAAG,QAAQ,CAAC,UAAU,IAAI,MAAM,CAAC,EAAE,EAAE,CACtC,CAAC;4BACF,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;4BAClC,SAAS;wBACX,CAAC;6BAAM,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;4BAChC,eAAe,GAAG,CAAC,cAAc,KAAK,IAAA,yCAAmB,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,CAAC;4BAChG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;4BAClC,SAAS;wBACX,CAAC;6BAAM,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;4BAClD,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAC;4BACxC,IAAI,QAAQ,EAAE,CAAC;gCACb,gBAAgB,GAAG,CAAC,eAAe,KAAK,IAAA,iCAAe,EAAC,EAAE,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;oCACvF,QAAQ;oCACR,IAAI,EAAE,SAAS;iCAChB,CAAC,CAAC;gCACH,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gCAClC,SAAS;4BACX,CAAC;wBACH,CAAC;oBACH,CAAC;oBACD,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC,CAAC;gBAC7D,CAAC;gBACD,IAAI,gBAAgB;oBAAE,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBAC1D,IAAI,iBAAiB;oBAAE,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;gBAC5D,IAAI,eAAe;oBAAE,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBACxD,IAAI,gBAAgB;oBAAE,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAC5D,CAAC;YAED,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1D,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;YACjF,CAAC;YACD,KAAK,MAAM,QAAQ,IAAI,kBAAkB,EAAE,CAAC;gBAC1C,QAAQ,CAAC,OAAO,EAAE,CAAC;YACrB,CAAC;YAED,0FAA0F;YAC1F,oEAAoE;YACpE,IAAI,kBAA6D,CAAC;YAClE,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1D,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC;oBAAE,SAAS;gBAEnD,qEAAqE;gBACrE,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAoB,CAAC;gBACrD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnC,MAAM,QAAQ,GAAG,IAAA,2CAA2B,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;oBAC1D,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClF,CAAC;gBACD,IAAI,gBAAgB,CAAC,IAAI,KAAK,CAAC;oBAAE,SAAS;gBAE1C,0GAA0G;gBAC1G,wGAAwG;gBACxG,mGAAmG;gBACnG,sGAAsG;gBACtG,2CAA2C;gBAC3C,SAAS,OAAO,CAAC,IAAsB;oBACrC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;oBAC/B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;wBACnC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAC9C,IAAI,QAAQ;4BAAE,KAAK,MAAM,KAAK,IAAI,QAAQ;gCAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBAC9D,CAAC;oBACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;oBACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC7D,CAAC;gBAED,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEd,MAAM,QAAQ,GAAI,SAAS,EAAE,SAAS,CAAC,GAAG,CAAS,EAAE,aAAa,EAAE,EAAE,CAAC;gBACvE,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;YAClE,CAAC;YACD,IAAI,kBAAkB;gBAAE,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,aAAa,CAAC,IAAI,EAAE,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,qHAAqH;AACrH,SAAS,cAAc,CAAC,QAAa;IACnC,OAAO,gBAAgB,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;AAC/E,CAAC"}
+{"version":3,"file":"populateBatchLoader.js","names":[],"sources":["../../src/batchloaders/populateBatchLoader.ts"],"sourcesContent":["import { type BatchLoader } from \"src/batchloaders/BatchLoader.ts\";\nimport { loadBatchLoader } from \"src/batchloaders/loadBatchLoader.ts\";\nimport { manyToManyBatchLoader } from \"src/batchloaders/manyToManyBatchLoader.ts\";\nimport { oneToManyBatchLoader } from \"src/batchloaders/oneToManyBatchLoader.ts\";\nimport { oneToOneBatchLoader } from \"src/batchloaders/oneToOneBatchLoader.ts\";\nimport { type Entity } from \"src/Entity.ts\";\nimport { type EntityMetadata } from \"src/EntityMetadata.ts\";\nimport {\n  AliasAssigner,\n  type EntityManager,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  getEmInternalApi,\n  indexBy,\n  keyToNumber,\n  kqDot,\n} from \"src/index.ts\";\nimport { type HintNode, buildHintTree } from \"src/loading/HintTree.ts\";\nimport type { LoadHint } from \"src/loading/loadHints.ts\";\nimport { hintKey } from \"src/normalizeHints.ts\";\nimport { getRelationFromMaybePolyKey, isPolyHint } from \"src/reactivity/reactiveHints.ts\";\nimport { ReactiveFieldImpl } from \"src/relations/ReactiveField.ts\";\nimport { toArray } from \"src/utils.ts\";\n\nexport const populateOperation = \"populate\";\n\nexport function populateBatchLoader(\n  em: EntityManager,\n  meta: EntityMetadata,\n  hint: LoadHint<any>,\n  mode: \"preload\" | \"intermixed\",\n  opts: { forceReload?: boolean } = {},\n): BatchLoader<{ entity: Entity; hint: LoadHint<any> }> {\n  // For batching populates, we want different levels of course-ness:\n  // - preloading populates that are only SQL should be batched together as much as possible, but\n  // - intermixed populates (some with custom relations) should be batched as separately as possible\n  //   (while still batching identical populates together) to reduce the chance of promise deadlocks.\n  //\n  // I.e. if we know this is a sql-only hint, we can batch all loads for a given entity\n  // together do leverage join-based preloading.\n  //\n  // However, intermixed batches can be prone to promise deadlocking (one relation .load getting\n  // stuck in a batch that is asking for its own dependencies to load), so if this is an intermixed\n  // hint, then use a batch key that includes the hint itself, which will make it unlikely\n  // for non-sql relations to deadlock on each other/themselves.\n  const batchKey =\n    mode === \"preload\" ? `${meta.tagName}:${opts.forceReload}` : `${meta.tagName}:${hintKey(hint)}:${opts.forceReload}`;\n  return em.getBatchLoader(populateOperation, batchKey, async (populates) => {\n    async function populateLayer(layerMeta: EntityMetadata | undefined, layerNode: HintNode<Entity>): Promise<void> {\n      // Skip join-based preloading if nothing in this layer needs loading. If any entity in the list\n      // needs loading, just load everything\n      const { preloader } = getEmInternalApi(em);\n      // We may not have a layerMeta if we're going through non-field properties\n      if (preloader && layerMeta) {\n        const preloadThisLayer = Object.entries(layerNode.hints).some(([key, hint]) => {\n          for (const entity of hint.entities) {\n            if ((entity as any)[key]?.isLoaded === false && !(entity as any)[key]?.isPreloaded) return true;\n          }\n          return false;\n        });\n        if (preloadThisLayer) {\n          // Do an up-front SQL call of `select id, ...preloads... from table`,\n          const assigner = new AliasAssigner();\n          const meta = layerMeta;\n          const alias = assigner.getAlias(meta.tableName);\n          const entities = [...layerNode.entities].filter((e) => !e.isNewEntity);\n          const ids = entities.map((e) => keyToNumber(meta, e.id));\n          // Create a ParsedFindQuery for `addPreloading` to inject joins into\n          const query: ParsedFindQuery = {\n            // We already have the entities loaded, so can do just `SELECT a.id` + the preload columns\n            selects: [kqDot(alias, \"id\")],\n            tables: [{ alias, join: \"primary\", table: meta.tableName }],\n            condition: {\n              kind: \"exp\",\n              op: \"and\",\n              conditions: [\n                { kind: \"column\", alias, column: \"id\", dbType: meta.idDbType, cond: { kind: \"in\", value: ids } },\n              ],\n            },\n            orderBys: [],\n          };\n          // If we're selecting from small_publishers, join in our base class in case\n          // the preloader wants to join on a column like `publishers.group_id`\n          addTablePerClassJoinsAndClassTag(query, meta, alias, false);\n          const hydrator = preloader.addPreloading(meta, layerNode, query);\n          if (hydrator) {\n            const rows = await em[\"executeFind\"](meta, populateOperation, query, {});\n            const entitiesById = indexBy(entities, (e) => keyToNumber(meta, e.id));\n            const entitiesInOrder = rows.map((row) => entitiesById.get(row[\"id\"]));\n            hydrator(rows, entitiesInOrder);\n          }\n        }\n      }\n\n      // First pass: batch SQL relations directly, fall back to relation.load() for non-SQL\n      const batchPromises = new Set<Promise<void>>();\n      const relationsToPreload: { preload(): void }[] = [];\n      const fallbackPromises: (Promise<any> | undefined)[] = [];\n\n      for (const [key, tree] of Object.entries(layerNode.hints)) {\n        const field = layerMeta?.allFields[key];\n        // Hoist the poly-key parsing out of the per-entity loop; most keys are not poly\n        const isPoly = isPolyHint(key);\n        let loader: BatchLoader<any> | undefined;\n        let batchPromise: Promise<void> | undefined;\n        for (const entity of tree.entities) {\n          const relation = isPoly ? getRelationFromMaybePolyKey(entity, key) : (entity as any)[key];\n          // This happens to let through non-relation hints like 'name' on user, which wasn't intentional,\n          // but currently doesn't blow up (somehow), and is depended on by internal tests.\n          if (!relation || typeof relation.load !== \"function\") {\n            // We don't want to throw on poly hints, because they're not actually loaded on the entity\n            if (isPoly) continue;\n            throw new Error(`Invalid load hint '${key}' on ${entity}`);\n          }\n\n          // If we're populating a hasReactiveField, don't bother loading it\n          // if it's already been calculated (i.e. we have no reason to believe its value\n          // is stale, so we should avoid pulling all of its data into memory).\n          //\n          // (Note that we can't do this same optimization for ReactiveReferenceImpl, because\n          // as a FK, it will always need at least some `.load()` to fetch its entity from the database.\n          // So we go ahead and call `.load()`, assuming it will just load its cached value, but it\n          // will also check internally if it's marked for recalc, and load its load hint if necessary.\n          if (relation instanceof ReactiveFieldImpl && relation.isSet) continue;\n          if (relation.isLoaded && !opts.forceReload) continue;\n          if (relation.isPreloaded) {\n            relation.preload();\n            continue;\n          }\n\n          // For non-derived SQL relations on existing entities, use batch loaders directly\n          // (1 shared promise per batch instead of per-entity async overhead).\n          // Skip new entities (no id) and derived relations (reactive m2m/m2o have extra logic in load).\n          if (!entity.isNewEntity && field) {\n            if (field.kind === \"o2m\") {\n              batchPromise = (loader ??= oneToManyBatchLoader(em, relation)).load(entity.idTagged!);\n              relationsToPreload.push(relation);\n              continue;\n            } else if (field.kind === \"m2m\" && !field.derived) {\n              batchPromise = (loader ??= manyToManyBatchLoader(em, relation)).load(\n                `${relation.columnName}=${entity.id}`,\n              );\n              relationsToPreload.push(relation);\n              continue;\n            } else if (field.kind === \"o2o\") {\n              batchPromise = (loader ??= oneToOneBatchLoader(em, relation)).load(entity.idTagged!);\n              relationsToPreload.push(relation);\n              continue;\n            } else if (field.kind === \"m2o\" && !field.derived) {\n              const taggedId = relation.idTaggedMaybe;\n              if (taggedId) {\n                batchPromise = (loader ??= loadBatchLoader(em, field.otherMetadata())).load({\n                  taggedId,\n                  hint: undefined,\n                });\n                relationsToPreload.push(relation);\n                continue;\n              }\n            }\n          }\n          fallbackPromises.push(relation.load(opts) as Promise<any>);\n        }\n        if (batchPromise) batchPromises.add(batchPromise);\n      }\n\n      if (batchPromises.size > 0 || fallbackPromises.length > 0) {\n        await Promise.all([Promise.all(batchPromises), Promise.all(fallbackPromises)]);\n      }\n      for (const relation of relationsToPreload) {\n        relation.preload();\n      }\n\n      // 2nd breadth-width pass to do nested load hints, this will fan out at the sibling level.\n      // i.e. populateLayer(...reviews...) & populateLayer(...comments...)\n      let nestedLoadPromises: (Promise<void> | undefined)[] | undefined;\n      for (const [key, tree] of Object.entries(layerNode.hints)) {\n        if (Object.keys(tree.hints).length === 0) continue;\n\n        // Get the children we found, i.e. [a1, a2, a3] -> all of their books\n        const childrenByParent = new Map<Entity, Entity[]>();\n        for (const entity of tree.entities) {\n          const relation = getRelationFromMaybePolyKey(entity, key);\n          childrenByParent.set(entity, relation ? toArray(getEvenDeleted(relation)) : []);\n        }\n        if (childrenByParent.size === 0) continue;\n\n        // Rewrite our node.entities to be the next layer of children, i.e. children will be all books, for all of\n        // `[a1, a2, a3]`, but only the books of `a2` need to recurse into `book: reviews` and only the books of\n        // `a3` need to recurse into `book: comments`, so swap `node.entities` (which is currently authors)\n        // with the books. This is what prevents our dataloader-merged TreeHint from over-fetching and loading\n        // the superset load hint for all entities.\n        function rewrite(node: HintNode<Entity>) {\n          const next = new Set<Entity>();\n          for (const entity of node.entities) {\n            const children = childrenByParent.get(entity);\n            if (children) for (const child of children) next.add(child);\n          }\n          node.entities = next;\n          Object.values(node.hints).forEach((node) => rewrite(node));\n        }\n\n        rewrite(tree);\n\n        const nextMeta = (layerMeta?.allFields[key] as any)?.otherMetadata?.();\n        (nestedLoadPromises ??= []).push(populateLayer(nextMeta, tree));\n      }\n      if (nestedLoadPromises) await Promise.all(nestedLoadPromises);\n    }\n\n    await populateLayer(meta, buildHintTree(populates));\n  });\n}\n\n/** Probes `relation` to see if it's a m2o/o2m/m2m relation that supports `getWithDeleted`, otherwise calls `get`. */\nfunction getEvenDeleted(relation: any): any {\n  return \"getWithDeleted\" in relation ? relation.getWithDeleted : relation.get;\n}\n"],"mappings":"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"}

package/build/batchloaders/recursiveChildrenBatchLoader.cjs

@@ -0,0 +1,78 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+require("./BatchLoader.cjs");
+const require_relations_Collection = require("../relations/Collection.cjs");
+require("../relations/RecursiveCollection.cjs");
+const require_fields = require("../fields.cjs");
+const require_keys = require("../keys.cjs");
+const require_queries_sql_keywords = require("../queries/sql/keywords.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
+const require_relations_OneToOneReference = require("../relations/OneToOneReference.cjs");
+const require_utils = require("../utils.cjs");
+const require_configure = require("../configure.cjs");
+require("../index.cjs");
+const require_EntityManager = require("../EntityManager.cjs");
+require("../Entity.cjs");
+//#region src/batchloaders/recursiveChildrenBatchLoader.ts
+const recursiveChildrenOperation = "o2m-recursive";
+function recursiveChildrenBatchLoader(em, collection) {
+	let { meta, fieldName } = collection;
+	while (!(collection.o2mFieldName in meta.fields) && meta.baseType) meta = require_configure.getMetadataForType(meta.baseType);
+	const batchKey = `${meta.tableName}-${fieldName}`;
+	return em.getBatchLoader(recursiveChildrenOperation, batchKey, async (parents) => {
+		const o2m = meta.allFields[collection.o2mFieldName];
+		const m2o = meta.allFields[o2m.otherFieldName];
+		const { columnName } = m2o.serde.columns[0];
+		const alias = require_utils.abbreviation(meta.tableName);
+		const query = {
+			selects: [`"${alias}".*`],
+			tables: [{
+				alias,
+				join: "primary",
+				table: meta.tableName
+			}, {
+				alias: `${alias}_cte`,
+				join: "inner",
+				table: `${alias}_cte`,
+				col1: `${alias}.id`,
+				col2: `${alias}_cte.id`
+			}],
+			orderBys: [{
+				alias,
+				column: "id",
+				order: "ASC"
+			}],
+			ctes: [{
+				alias: `${alias}_cte`,
+				query: {
+					kind: "raw",
+					sql: `
+             SELECT b.id, b.${columnName} FROM ${require_queries_sql_keywords.kq(meta.tableName)} b WHERE b.${columnName} = ANY(?)
+             UNION
+             SELECT r.id, r.${columnName} FROM ${require_queries_sql_keywords.kq(meta.tableName)} r JOIN ${alias}_cte ON r.${columnName} = ${alias}_cte.id
+            `,
+					bindings: [require_keys.deTagIds(meta, parents.map((e) => e.idTagged))]
+				},
+				recursive: true
+			}]
+		};
+		require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
+		const rowData = await em["executeFindRowData"](meta, recursiveChildrenOperation, query, {});
+		const entities = em["hydrateAndFinalize"](meta.cstr, rowData);
+		const entitiesById = require_utils.groupBy(entities, (entity) => {
+			return require_keys.maybeResolveReferenceToId(require_fields.getField(entity, m2o.fieldName)) ?? "root";
+		});
+		for (const [parentId, children] of entitiesById) if (parentId !== "root") {
+			require_EntityManager.getEmInternalApi(em).setPreloadedRelation(parentId, o2m.fieldName, children);
+			em.getEntity(parentId)[o2m.fieldName].preload();
+		}
+		for (const entity of [...parents, ...entities]) if (!require_relations_Collection.isLoadedCollection(entity[o2m.fieldName]) && !require_relations_OneToOneReference.isLoadedOneToOneReference(entity[o2m.fieldName])) {
+			require_EntityManager.getEmInternalApi(em).setPreloadedRelation(entity.id, o2m.fieldName, []);
+			entity[o2m.fieldName].preload();
+		}
+	});
+}
+//#endregion
+exports.recursiveChildrenBatchLoader = recursiveChildrenBatchLoader;
+exports.recursiveChildrenOperation = recursiveChildrenOperation;
+
+//# sourceMappingURL=recursiveChildrenBatchLoader.cjs.map

package/build/batchloaders/recursiveChildrenBatchLoader.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"recursiveChildrenBatchLoader.cjs","names":["getMetadataForType","abbreviation","kq","deTagIds","groupBy","maybeResolveReferenceToId","getField","isLoadedCollection","isLoadedOneToOneReference"],"sources":["../../src/batchloaders/recursiveChildrenBatchLoader.ts"],"sourcesContent":["import { type BatchLoader } from \"src/batchloaders/BatchLoader.ts\";\nimport { getMetadataForType } from \"src/configure.ts\";\nimport { type Entity } from \"src/Entity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"src/EntityManager.ts\";\nimport {\n  type ManyToOneField,\n  type OneToManyField,\n  type OneToOneField,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  deTagIds,\n  getField,\n  isLoadedCollection,\n  isLoadedOneToOneReference,\n  kq,\n  maybeResolveReferenceToId,\n} from \"src/index.ts\";\nimport { type RecursiveChildrenCollectionImpl } from \"src/relations/RecursiveCollection.ts\";\nimport { abbreviation, groupBy } from \"src/utils.ts\";\n\nexport const recursiveChildrenOperation = \"o2m-recursive\";\n\nexport function recursiveChildrenBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: RecursiveChildrenCollectionImpl<T, U>,\n): BatchLoader<Entity> {\n  let { meta, fieldName } = collection;\n  // This could be called from subtypes to get relations defined on the parent. So we need to make sure we are using the\n  // correct meta by walking the inheritance tree until we find the meta that actually has the root o2m field\n  // We intentionally don't use getMetadataForField here because CTI-specialized fields stay on the subtype metadata,\n  // while these raw recursive CTEs need the metadata/table that physically owns the FK column.\n  while (!(collection.o2mFieldName in meta.fields) && meta.baseType) meta = getMetadataForType(meta.baseType);\n  const batchKey = `${meta.tableName}-${fieldName}`;\n  return em.getBatchLoader(recursiveChildrenOperation, batchKey, async (parents) => {\n    const o2m = meta.allFields[collection.o2mFieldName] as OneToManyField | OneToOneField;\n    const m2o = meta.allFields[o2m.otherFieldName] as ManyToOneField;\n    const { columnName } = m2o.serde.columns[0];\n\n    const alias = abbreviation(meta.tableName);\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [\n        // We still select directly from our table, and join into the CTE so that we\n        // can use `addTablePerClassJoinsAndClassTag` to get inheritance added for free.\n        { alias, join: \"primary\", table: meta.tableName },\n        { alias: `${alias}_cte`, join: \"inner\", table: `${alias}_cte`, col1: `${alias}.id`, col2: `${alias}_cte.id` },\n      ],\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n      ctes: [\n        {\n          alias: `${alias}_cte`,\n          query: {\n            kind: \"raw\",\n            // b is our base case, which is the immediate children of the parents, and r is the\n            // recursive case of finding their children.\n            sql: `\n             SELECT b.id, b.${columnName} FROM ${kq(meta.tableName)} b WHERE b.${columnName} = ANY(?)\n             UNION\n             SELECT r.id, r.${columnName} FROM ${kq(meta.tableName)} r JOIN ${alias}_cte ON r.${columnName} = ${alias}_cte.id\n            `,\n            // RecursiveChildrenCollectionImpl won't call `.load` on new entities, so we can assume entities have an id\n            bindings: [\n              deTagIds(\n                meta,\n                parents.map((e) => e.idTagged),\n              ),\n            ],\n          },\n          recursive: true,\n        },\n      ],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n\n    const rowData = await em[\"executeFindRowData\"](meta, recursiveChildrenOperation, query, {});\n    const entities = em[\"hydrateAndFinalize\"](meta.cstr, rowData);\n\n    // For all the entities we found, group them by their parent (or the root node, which has no parent)\n    const entitiesById = groupBy(entities, (entity) => {\n      const parentId = maybeResolveReferenceToId(getField(entity, m2o.fieldName));\n      return parentId ?? \"root\";\n    });\n\n    // For each found parent, use the preloading infra to inject the children into the relation\n    for (const [parentId, children] of entitiesById) {\n      if (parentId !== \"root\") {\n        getEmInternalApi(em).setPreloadedRelation(parentId, o2m.fieldName, children);\n        // I thought we could delay calling this, but currently `em.populate` calls `preload()` explicitly\n        (em.getEntity(parentId) as any)[o2m.fieldName].preload();\n      }\n    }\n\n    // Any entity[o2m] still not loaded must be a leaf which didn't have any children; go ahead and mark it as loaded\n    for (const entity of [...parents, ...entities]) {\n      if (!isLoadedCollection(entity[o2m.fieldName]) && !isLoadedOneToOneReference(entity[o2m.fieldName])) {\n        getEmInternalApi(em).setPreloadedRelation(entity.id, o2m.fieldName, []);\n        entity[o2m.fieldName].preload();\n      }\n    }\n  });\n}\n"],"mappings":";;;;;;;;;;;;;;;AAoBA,MAAa,6BAA6B;AAE1C,SAAgB,6BACd,IACA,YACqB;CACrB,IAAI,EAAE,MAAM,cAAc;CAK1B,OAAO,EAAE,WAAW,gBAAgB,KAAK,WAAW,KAAK,UAAU,OAAOA,kBAAAA,mBAAmB,KAAK,QAAQ;CAC1G,MAAM,WAAW,GAAG,KAAK,UAAU,GAAG;CACtC,OAAO,GAAG,eAAe,4BAA4B,UAAU,OAAO,YAAY;EAChF,MAAM,MAAM,KAAK,UAAU,WAAW;EACtC,MAAM,MAAM,KAAK,UAAU,IAAI;EAC/B,MAAM,EAAE,eAAe,IAAI,MAAM,QAAQ;EAEzC,MAAM,QAAQC,cAAAA,aAAa,KAAK,SAAS;EACzC,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAGN;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,GAChD;IAAE,OAAO,GAAG,MAAM;IAAO,MAAM;IAAS,OAAO,GAAG,MAAM;IAAO,MAAM,GAAG,MAAM;IAAM,MAAM,GAAG,MAAM;GAAS,CAC9G;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;GAChD,MAAM,CACJ;IACE,OAAO,GAAG,MAAM;IAChB,OAAO;KACL,MAAM;KAGN,KAAK;8BACa,WAAW,QAAQC,6BAAAA,GAAG,KAAK,SAAS,EAAE,aAAa,WAAW;;8BAE9D,WAAW,QAAQA,6BAAAA,GAAG,KAAK,SAAS,EAAE,UAAU,MAAM,YAAY,WAAW,KAAK,MAAM;;KAG1G,UAAU,CACRC,aAAAA,SACE,MACA,QAAQ,KAAK,MAAM,EAAE,QAAQ,CAC/B,CACF;IACF;IACA,WAAW;GACb,CACF;EACF;EAEA,iCAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,4BAA4B,OAAO,CAAC,CAAC;EAC1F,MAAM,WAAW,GAAG,qBAAqB,CAAC,KAAK,MAAM,OAAO;EAG5D,MAAM,eAAeC,cAAAA,QAAQ,WAAW,WAAW;GAEjD,OADiBC,aAAAA,0BAA0BC,eAAAA,SAAS,QAAQ,IAAI,SAAS,CAC3D,KAAK;EACrB,CAAC;EAGD,KAAK,MAAM,CAAC,UAAU,aAAa,cACjC,IAAI,aAAa,QAAQ;GACvB,sBAAA,iBAAiB,EAAE,CAAC,CAAC,qBAAqB,UAAU,IAAI,WAAW,QAAQ;GAE3E,GAAI,UAAU,QAAQ,CAAC,CAAS,IAAI,UAAU,CAAC,QAAQ;EACzD;EAIF,KAAK,MAAM,UAAU,CAAC,GAAG,SAAS,GAAG,QAAQ,GAC3C,IAAI,CAACC,6BAAAA,mBAAmB,OAAO,IAAI,UAAU,KAAK,CAACC,oCAAAA,0BAA0B,OAAO,IAAI,UAAU,GAAG;GACnG,sBAAA,iBAAiB,EAAE,CAAC,CAAC,qBAAqB,OAAO,IAAI,IAAI,WAAW,CAAC,CAAC;GACtE,OAAO,IAAI,UAAU,CAAC,QAAQ;EAChC;CAEJ,CAAC;AACH"}

package/build/batchloaders/recursiveChildrenBatchLoader.d.cts

@@ -0,0 +1,10 @@
+import { BatchLoader } from "./BatchLoader.cjs";
+import { RecursiveChildrenCollectionImpl } from "../relations/RecursiveCollection.cjs";
+import { EntityManager } from "../EntityManager.cjs";
+import { Entity } from "../Entity.cjs";
+//#region src/batchloaders/recursiveChildrenBatchLoader.d.ts
+declare const recursiveChildrenOperation = "o2m-recursive";
+declare function recursiveChildrenBatchLoader<T extends Entity, U extends Entity>(em: EntityManager, collection: RecursiveChildrenCollectionImpl<T, U>): BatchLoader<Entity>;
+//#endregion
+export { recursiveChildrenBatchLoader, recursiveChildrenOperation };
+//# sourceMappingURL=recursiveChildrenBatchLoader.d.cts.map

package/build/batchloaders/recursiveChildrenBatchLoader.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recursiveChildrenBatchLoader.d.cts","names":[],"sources":["../../src/batchloaders/recursiveChildrenBatchLoader.ts"],"mappings":";;;;;cAoBa;iBAEG,6BAA6B,UAAU,QAAQ,UAAU,QACvE,IAAI,eACJ,YAAY,gCAAgC,GAAG,KAC9C,YAAY"}

package/build/batchloaders/recursiveChildrenBatchLoader.d.mts

@@ -0,0 +1,10 @@
+import { BatchLoader } from "./BatchLoader.mjs";
+import { RecursiveChildrenCollectionImpl } from "../relations/RecursiveCollection.mjs";
+import { EntityManager } from "../EntityManager.mjs";
+import { Entity } from "../Entity.mjs";
+//#region src/batchloaders/recursiveChildrenBatchLoader.d.ts
+declare const recursiveChildrenOperation = "o2m-recursive";
+declare function recursiveChildrenBatchLoader<T extends Entity, U extends Entity>(em: EntityManager, collection: RecursiveChildrenCollectionImpl<T, U>): BatchLoader<Entity>;
+//#endregion
+export { recursiveChildrenBatchLoader, recursiveChildrenOperation };
+//# sourceMappingURL=recursiveChildrenBatchLoader.d.mts.map

package/build/batchloaders/recursiveChildrenBatchLoader.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recursiveChildrenBatchLoader.d.mts","names":[],"sources":["../../src/batchloaders/recursiveChildrenBatchLoader.ts"],"mappings":";;;;;cAoBa;iBAEG,6BAA6B,UAAU,QAAQ,UAAU,QACvE,IAAI,eACJ,YAAY,gCAAgC,GAAG,KAC9C,YAAY"}