joist-core 2.3.0 → 2.4.0

package/build/preloading/JsonAggregatePreloader.js

@@ -1,329 +1,279 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonAggregatePreloader = void 0;
-const AliasAssigner_1 = require("../AliasAssigner");
-const ConditionBuilder_1 = require("../ConditionBuilder");
-const EntityManager_1 = require("../EntityManager");
-const EntityMetadata_1 = require("../EntityMetadata");
-const keys_1 = require("../keys");
-const keywords_1 = require("../keywords");
-const QueryParser_1 = require("../QueryParser");
-const canPreload_1 = require("./canPreload");
-const partitionHint_1 = require("./partitionHint");
+import { keyToNumber, keyToTaggedId } from "../keys.js";
+import { kq, kqDot } from "../queries/sql/keywords.js";
+import { ConditionBuilder } from "../queries/ConditionBuilder.js";
+import { getTables } from "../queries/find/QueryParser.js";
+import { fail } from "../utils.js";
+import { getMetadata, getMetadataForField } from "../EntityMetadata.js";
+import { canPreload } from "./canPreload.js";
+import { partitionHint } from "./partitionHint.js";
+import { AliasAssigner } from "../queries/sql/AliasAssigner.js";
+import "../plugins/PreloadPlugin.js";
+import { getEmInternalApi } from "../EntityManager.js";
+import "../Entity.js";
+//#region src/preloading/JsonAggregatePreloader.ts
 /**
- * A PreloadPlugin implementation that uses `CROSS LATERAL JOIN` and `json_aggregate`
- * to preload/reduce a subtree of data while still being a single row of data.
- */
-class JsonAggregatePreloader {
-    partitionHint(meta, hint) {
-        return (0, partitionHint_1.partitionHint)(meta, hint);
-    }
-    addPreloading(meta, root, query) {
-        const assigner = new AliasAssigner_1.AliasAssigner(query);
-        // Get the existing primary alias
-        const alias = (0, QueryParser_1.getTables)(query)[0].alias;
-        const joins = calcLateralJoins(assigner, { tree: root, alias, meta }, root, alias, meta);
-        // If there are no sql-based preload in the hints, just return
-        if (joins.length === 0)
-            return undefined;
-        // Include the aggregate `_b1._ as _prequel`, `_c._ as _randomComment`
-        for (const { alias, relationAlias, join } of joins) {
-            query.selects.push({
-                sql: `${(0, keywords_1.kqDot)(alias, "_")} as ${(0, keywords_1.kq)(relationAlias)}`,
-                aliases: [alias],
-                bindings: [],
-            });
-            query.tables.push(join);
-        }
-        return (rows, entities) => {
-            rows.forEach((row, i) => {
-                const parent = entities[i];
-                for (const { relationAlias, hydrator } of joins) {
-                    hydrator(parent, parent, row[relationAlias] ?? []);
-                }
-            });
-        };
-    }
-    getPreloadJoins(meta, root, query) {
-        const assigner = new AliasAssigner_1.AliasAssigner(query);
-        // Get the existing primary alias
-        const alias = (0, QueryParser_1.getTables)(query)[0].alias;
-        const joins = calcLateralJoins(assigner, { tree: root, alias, meta }, root, alias, meta);
-        // If there are no sql-based preload in the hints, just return
-        // Adapt our json aggregate joins to the higher-level JoinResult
-        return joins.map((join) => {
-            return {
-                selects: [{ value: (0, keywords_1.kqDot)(join.alias, "_"), as: join.relationAlias }],
-                join: join.join,
-                hydrator: (rows, entities) => {
-                    rows.forEach((row, i) => {
-                        const parent = entities[i];
-                        join.hydrator(parent, parent, row[join.relationAlias] ?? []);
-                    });
-                },
-            };
-        });
-    }
-}
-exports.JsonAggregatePreloader = JsonAggregatePreloader;
+* A PreloadPlugin implementation that uses `CROSS LATERAL JOIN` and `json_aggregate`
+* to preload/reduce a subtree of data while still being a single row of data.
+*/
+var JsonAggregatePreloader = class {
+	partitionHint(meta, hint) {
+		return partitionHint(meta, hint);
+	}
+	addPreloading(meta, root, query) {
+		const assigner = new AliasAssigner(query);
+		const alias = getTables(query)[0].alias;
+		const joins = calcLateralJoins(assigner, {
+			tree: root,
+			alias,
+			meta
+		}, root, alias, meta);
+		if (joins.length === 0) return void 0;
+		for (const { alias, relationAlias, join } of joins) {
+			query.selects.push({
+				sql: `${kqDot(alias, "_")} as ${kq(relationAlias)}`,
+				aliases: [alias],
+				bindings: []
+			});
+			query.tables.push(join);
+		}
+		return (rows, entities) => {
+			for (let i = 0; i < entities.length; i++) {
+				const parent = entities[i];
+				for (const { relationAlias, hydrator } of joins) hydrator(parent, parent, readRowValue(rows, i, relationAlias) ?? []);
+			}
+		};
+	}
+	getPreloadJoins(meta, root, query) {
+		const assigner = new AliasAssigner(query);
+		const alias = getTables(query)[0].alias;
+		return calcLateralJoins(assigner, {
+			tree: root,
+			alias,
+			meta
+		}, root, alias, meta).map((join) => {
+			return {
+				selects: [{
+					value: kqDot(join.alias, "_"),
+					as: join.relationAlias
+				}],
+				join: join.join,
+				hydrator: (rows, entities) => {
+					for (let i = 0; i < entities.length; i++) {
+						const parent = entities[i];
+						join.hydrator(parent, parent, readRowValue(rows, i, join.relationAlias) ?? []);
+					}
+				}
+			};
+		});
+	}
+};
 /**
- * For a given hint tree `hint`, finds all SQL-able relations and preloads them.
- *
- * Specifically we use `json_agg` & `json_build_array` to `CROSS LATERAL JOIN`
- * children/grand children back as arbitrarily-deeply nested arrays, and then
- * stash the results in the `EntityManager` `joinLoadedRelations` cache, which
- * each join-instrumented relation will check before making its SQL calls.
- *
- * https://sqlfum.pt/?n=60&indent=2&spaces=1&simplify=1&align=0&case=lower&sql=c2VsZWN0IGEuaWQsIGIuXyBhcyBiLCBjMS5fIGFzIGMxLCBhMS5fIGFzIGExIGZyb20gYXV0aG9ycyBhIGNyb3NzIGpvaW4gbGF0ZXJhbCAoIHNlbGVjdCBqc29uX2FnZyhqc29uX2J1aWxkX2FycmF5KGIuaWQsIGIudGl0bGUsIGIuIm9yZGVyIiwgYi5kZWxldGVkX2F0LCBiLmNyZWF0ZWRfYXQsIGIudXBkYXRlZF9hdCwgYi5hdXRob3JfaWQsIGJyLl8pKSBhcyBfIGZyb20gYm9va3MgYiBjcm9zcyBqb2luIGxhdGVyYWwgKCBzZWxlY3QganNvbl9hZ2coanNvbl9idWlsZF9hcnJheShici5pZCwgYnIucmF0aW5nLCBici5pc19wdWJsaWMsIGJyLmlzX3Rlc3QsIGJyLmNyZWF0ZWRfYXQsIGJyLnVwZGF0ZWRfYXQsIGJyLmJvb2tfaWQsIGMuXykpIGFzIF8gZnJvbSBib29rX3Jldmlld3MgYnIgY3Jvc3Mgam9pbiBsYXRlcmFsICggc2VsZWN0IGpzb25fYWdnKGpzb25fYnVpbGRfYXJyYXkoYy5pZCwgYy50ZXh0LCBjLmNyZWF0ZWRfYXQsIGMudXBkYXRlZF9hdCwgYy51c2VyX2lkLCBjLnBhcmVudF9hdXRob3JfaWQsIGMucGFyZW50X2Jvb2tfaWQsIGMucGFyZW50X2Jvb2tfcmV2aWV3X2lkLCBjLnBhcmVudF9wdWJsaXNoZXJfaWQpKSBhcyBfIGZyb20gY29tbWVudHMgYyB3aGVyZSBjLnBhcmVudF9ib29rX3Jldmlld19pZCA9IGJyLmlkICkgYyB3aGVyZSBici5ib29rX2lkID0gYi5pZCApIGJyIHdoZXJlIGIuYXV0aG9yX2lkID0gYS5pZCApIGIgY3Jvc3Mgam9pbiBsYXRlcmFsICggc2VsZWN0IGpzb25fYWdnKGpzb25fYnVpbGRfYXJyYXkoYzEuaWQsIGMxLnRleHQsIGMxLmNyZWF0ZWRfYXQsIGMxLnVwZGF0ZWRfYXQsIGMxLnVzZXJfaWQsIGMxLnBhcmVudF9hdXRob3JfaWQsIGMxLnBhcmVudF9ib29rX2lkLCBjMS5wYXJlbnRfYm9va19yZXZpZXdfaWQsIGMxLnBhcmVudF9wdWJsaXNoZXJfaWQpKSBhcyBfIGZyb20gY29tbWVudHMgYzEgd2hlcmUgYzEucGFyZW50X2F1dGhvcl9pZCA9IGEuaWQgKSBjMSBjcm9zcyBqb2luIGxhdGVyYWwgKCBzZWxlY3QganNvbl9hZ2coanNvbl9idWlsZF9hcnJheShhMS5pZCwgYTEuZmlyc3RfbmFtZSwgYTEubGFzdF9uYW1lLCBhMS5zc24sIGExLmluaXRpYWxzLCBhMS5udW1iZXJfb2ZfYm9va3MsIGExLmJvb2tfY29tbWVudHMsIGExLmlzX3BvcHVsYXIsIGExLmFnZSwgYTEuZ3JhZHVhdGVkLCBhMS5uaWNrX25hbWVzLCBhMS53YXNfZXZlcl9wb3B1bGFyLCBhMS5hZGRyZXNzLCBhMS5idXNpbmVzc19hZGRyZXNzLCBhMS5xdW90ZXMsIGExLm51bWJlcl9vZl9hdG9tcywgYTEuZGVsZXRlZF9hdCwgYTEubnVtYmVyX29mX3B1YmxpY19yZXZpZXdzLCBhMS4ibnVtYmVyT2ZQdWJsaWNSZXZpZXdzMiIsIGExLnRhZ3Nfb2ZfYWxsX2Jvb2tzLCBhMS5jcmVhdGVkX2F0LCBhMS51cGRhdGVkX2F0LCBhMS5mYXZvcml0ZV9zaGFwZSwgYTEuZmF2b3JpdGVfY29sb3JzLCBhMS5tZW50b3JfaWQsIGExLmN1cnJlbnRfZHJhZnRfYm9va19pZCwgYTEuZmF2b3JpdGVfYm9va19pZCwgYTEucHVibGlzaGVyX2lkKSkgYXMgXyBmcm9tIGF1dGhvcnMgYTEgd2hlcmUgYTEuaWQgPSBhLm1lbnRvcl9pZCApIGExIHdoZXJlIGEuaWQgPSAxOw%3D%3D
- */
+* For a given hint tree `hint`, finds all SQL-able relations and preloads them.
+*
+* Specifically we use `json_agg` & `json_build_array` to `CROSS LATERAL JOIN`
+* children/grand children back as arbitrarily-deeply nested arrays, and then
+* stash the results in the `EntityManager` `joinLoadedRelations` cache, which
+* each join-instrumented relation will check before making its SQL calls.
+*
+* https://sqlfum.pt/?n=60&indent=2&spaces=1&simplify=1&align=0&case=lower&sql=c2VsZWN0IGEuaWQsIGIuXyBhcyBiLCBjMS5fIGFzIGMxLCBhMS5fIGFzIGExIGZyb20gYXV0aG9ycyBhIGNyb3NzIGpvaW4gbGF0ZXJhbCAoIHNlbGVjdCBqc29uX2FnZyhqc29uX2J1aWxkX2FycmF5KGIuaWQsIGIudGl0bGUsIGIuIm9yZGVyIiwgYi5kZWxldGVkX2F0LCBiLmNyZWF0ZWRfYXQsIGIudXBkYXRlZF9hdCwgYi5hdXRob3JfaWQsIGJyLl8pKSBhcyBfIGZyb20gYm9va3MgYiBjcm9zcyBqb2luIGxhdGVyYWwgKCBzZWxlY3QganNvbl9hZ2coanNvbl9idWlsZF9hcnJheShici5pZCwgYnIucmF0aW5nLCBici5pc19wdWJsaWMsIGJyLmlzX3Rlc3QsIGJyLmNyZWF0ZWRfYXQsIGJyLnVwZGF0ZWRfYXQsIGJyLmJvb2tfaWQsIGMuXykpIGFzIF8gZnJvbSBib29rX3Jldmlld3MgYnIgY3Jvc3Mgam9pbiBsYXRlcmFsICggc2VsZWN0IGpzb25fYWdnKGpzb25fYnVpbGRfYXJyYXkoYy5pZCwgYy50ZXh0LCBjLmNyZWF0ZWRfYXQsIGMudXBkYXRlZF9hdCwgYy51c2VyX2lkLCBjLnBhcmVudF9hdXRob3JfaWQsIGMucGFyZW50X2Jvb2tfaWQsIGMucGFyZW50X2Jvb2tfcmV2aWV3X2lkLCBjLnBhcmVudF9wdWJsaXNoZXJfaWQpKSBhcyBfIGZyb20gY29tbWVudHMgYyB3aGVyZSBjLnBhcmVudF9ib29rX3Jldmlld19pZCA9IGJyLmlkICkgYyB3aGVyZSBici5ib29rX2lkID0gYi5pZCApIGJyIHdoZXJlIGIuYXV0aG9yX2lkID0gYS5pZCApIGIgY3Jvc3Mgam9pbiBsYXRlcmFsICggc2VsZWN0IGpzb25fYWdnKGpzb25fYnVpbGRfYXJyYXkoYzEuaWQsIGMxLnRleHQsIGMxLmNyZWF0ZWRfYXQsIGMxLnVwZGF0ZWRfYXQsIGMxLnVzZXJfaWQsIGMxLnBhcmVudF9hdXRob3JfaWQsIGMxLnBhcmVudF9ib29rX2lkLCBjMS5wYXJlbnRfYm9va19yZXZpZXdfaWQsIGMxLnBhcmVudF9wdWJsaXNoZXJfaWQpKSBhcyBfIGZyb20gY29tbWVudHMgYzEgd2hlcmUgYzEucGFyZW50X2F1dGhvcl9pZCA9IGEuaWQgKSBjMSBjcm9zcyBqb2luIGxhdGVyYWwgKCBzZWxlY3QganNvbl9hZ2coanNvbl9idWlsZF9hcnJheShhMS5pZCwgYTEuZmlyc3RfbmFtZSwgYTEubGFzdF9uYW1lLCBhMS5zc24sIGExLmluaXRpYWxzLCBhMS5udW1iZXJfb2ZfYm9va3MsIGExLmJvb2tfY29tbWVudHMsIGExLmlzX3BvcHVsYXIsIGExLmFnZSwgYTEuZ3JhZHVhdGVkLCBhMS5uaWNrX25hbWVzLCBhMS53YXNfZXZlcl9wb3B1bGFyLCBhMS5hZGRyZXNzLCBhMS5idXNpbmVzc19hZGRyZXNzLCBhMS5xdW90ZXMsIGExLm51bWJlcl9vZl9hdG9tcywgYTEuZGVsZXRlZF9hdCwgYTEubnVtYmVyX29mX3B1YmxpY19yZXZpZXdzLCBhMS4ibnVtYmVyT2ZQdWJsaWNSZXZpZXdzMiIsIGExLnRhZ3Nfb2ZfYWxsX2Jvb2tzLCBhMS5jcmVhdGVkX2F0LCBhMS51cGRhdGVkX2F0LCBhMS5mYXZvcml0ZV9zaGFwZSwgYTEuZmF2b3JpdGVfY29sb3JzLCBhMS5tZW50b3JfaWQsIGExLmN1cnJlbnRfZHJhZnRfYm9va19pZCwgYTEuZmF2b3JpdGVfYm9va19pZCwgYTEucHVibGlzaGVyX2lkKSkgYXMgXyBmcm9tIGF1dGhvcnMgYTEgd2hlcmUgYTEuaWQgPSBhLm1lbnRvcl9pZCApIGExIHdoZXJlIGEuaWQgPSAxOw%3D%3D
+*/
 /**
- * Given a `parent` like Author, and a hint of `{ books: ..., comments: ... }`, create `CROSS JOIN LATERAL`s
- * that will pull in the `books` & `comments` children.
- */
+* Given a `parent` like Author, and a hint of `{ books: ..., comments: ... }`, create `CROSS JOIN LATERAL`s
+* that will pull in the `books` & `comments` children.
+*/
 function calcLateralJoins(assigner, root, tree, parentAlias, parentMeta, pathPrefix = "") {
-    const results = [];
-    // Join in SQL-able hints from parent
-    Object.entries(tree.hints).forEach(([key, subTree]) => {
-        const field = parentMeta.allFields[key];
-        // AsyncProperties don't have fields, which is fine, skip for now...
-        if (field && (0, canPreload_1.canPreload)(parentMeta, field)) {
-            // Enum m2ms have no "other" entity to join/hydrate; just aggregate the join table's enum ids.
-            if (field.kind === "m2mEnum") {
-                results.push(calcEnumLateralJoin(assigner, root, subTree, parentAlias, field, key, pathPrefix));
-                return;
-            }
-            const otherMeta = field.otherMetadata();
-            const otherField = otherMeta.allFields[field.otherFieldName];
-            // Short table alias for column refs inside the subquery, e.g. `_b1`
-            const otherAlias = `_${assigner.getAlias(otherMeta.tableName)}`;
-            // Readable path-based column alias for the outer AS clause, e.g. `_books_reviews`
-            const pathKey = key.toLowerCase();
-            const relationAlias = `_${assigner.getLiteralAlias(`${pathPrefix}${pathKey}`)}`;
-            // Do the recursion up-front, so we can work it into our own join/hydrator
-            const subJoins = calcLateralJoins(assigner, root, subTree, otherAlias, otherMeta, `${pathPrefix}${pathKey}_`);
-            // Get all fields with serdes and flatten out the columns
-            const columns = Object.values(otherMeta.allFields)
-                .filter((f) => f.serde)
-                .flatMap((f) => f.serde.columns);
-            const selects = [
-                ...columns.map((c) => (0, keywords_1.kqDot)(otherAlias, c.columnName)),
-                // We eventually need to handle parent types/subtypes here...
-                // Combine any grandchilden
-                ...subJoins.map((sb) => (0, keywords_1.kqDot)(sb.alias, "_")),
-            ];
-            const aliasMaybeSuffix = (0, keywords_1.kq)(`${parentAlias}${field.aliasSuffix}`);
-            const cb = new ConditionBuilder_1.ConditionBuilder();
-            let m2mTable;
-            let m2mAlias;
-            if (otherField.kind === "m2o") {
-                cb.addRawCondition({
-                    aliases: [otherAlias, parentAlias],
-                    condition: `${(0, keywords_1.kqDot)(otherAlias, otherField.serde.columns[0].columnName)} = ${(0, keywords_1.kqDot)(parentAlias, "id")}`,
-                    pruneable: true,
-                });
-            }
-            else if (otherField.kind === "poly") {
-                // Get the component that points to us
-                // const comp = otherField.components.find((c) => getAllMetas(parentMeta).some((m) => m.cstr === c.otherMetadata().cstr)) ??
-                const comp = otherField.components.find((c) => parentMeta.cstr === c.otherMetadata().cstr) ??
-                    fail(`No component found for ${field.fieldName} -> ${otherField.fieldName}`);
-                cb.addRawCondition({
-                    aliases: [otherAlias, parentAlias],
-                    condition: `${(0, keywords_1.kqDot)(otherAlias, comp.columnName)} = ${(0, keywords_1.kqDot)(parentAlias, "id")}`,
-                    pruneable: true,
-                });
-            }
-            else if (otherField.kind === "o2m" || otherField.kind === "lo2m") {
-                cb.addRawCondition({
-                    aliases: [otherAlias, aliasMaybeSuffix],
-                    condition: `${(0, keywords_1.kqDot)(otherAlias, "id")} = ${aliasMaybeSuffix}.${(0, keywords_1.kq)(field.serde.columns[0].columnName)}`,
-                    pruneable: true,
-                });
-            }
-            else if (otherField.kind === "o2o") {
-                cb.addRawCondition({
-                    aliases: [otherAlias, aliasMaybeSuffix],
-                    condition: `${(0, keywords_1.kqDot)(otherAlias, "id")} = ${aliasMaybeSuffix}.${(0, keywords_1.kq)(field.serde.columns[0].columnName)}`,
-                    pruneable: true,
-                });
-            }
-            else if (otherField.kind === "m2m") {
-                m2mAlias = assigner.getAlias(otherField.joinTableName);
-                // Get the m2m row's id to track in JoinRows; id-less tables have no surrogate id.
-                if (otherField.hasJoinTableId)
-                    selects.unshift((0, keywords_1.kqDot)(m2mAlias, "id"));
-                m2mTable = {
-                    join: "inner",
-                    table: otherField.joinTableName,
-                    alias: m2mAlias,
-                    col1: (0, keywords_1.kqDot)(parentAlias, "id"),
-                    col2: (0, keywords_1.kqDot)(m2mAlias, otherField.columnNames[1]),
-                };
-                cb.addRawCondition({
-                    aliases: [m2mAlias, otherAlias],
-                    condition: `${(0, keywords_1.kqDot)(m2mAlias, otherField.columnNames[0])} = ${(0, keywords_1.kqDot)(otherAlias, "id")}`,
-                    pruneable: true,
-                });
-            }
-            else {
-                throw new Error(`Unsupported otherField.kind ${otherField.kind}`);
-            }
-            const needsSubSelect = subTree.entities.size !== root.tree.entities.size;
-            if (needsSubSelect) {
-                cb.addRawCondition({
-                    aliases: [root.alias],
-                    condition: `${(0, keywords_1.kqDot)(root.alias, "id")} = ANY(?)`,
-                    bindings: [
-                        [...subTree.entities]
-                            .filter((e) => typeof e === "string" || !e.isNewEntity)
-                            .map((e) => (0, keys_1.keyToNumber)(root.meta, typeof e === "string" ? e : e.id)),
-                    ],
-                    pruneable: true,
-                });
-            }
-            // For m2m, order by the join-row's id so preloaded results match the order the lazy batch
-            // loader returns (which orders by join-row id). Id-less join tables have no surrogate id,
-            // so order by the other entity's FK column (matching the lazy loader & getOthers). Otherwise,
-            // order by the target entity's id.
-            const orderBy = otherField.kind === "m2m" && !otherField.hasJoinTableId
-                ? `${(0, keywords_1.kq)(m2mAlias)}.${(0, keywords_1.kq)(otherField.columnNames[0])}`
-                : `${(0, keywords_1.kq)(m2mAlias ?? otherAlias)}.id`;
-            const join = {
-                join: "lateral",
-                alias: otherAlias,
-                // Do we need to say which alias we're coming from, to avoid having it pruned?
-                // ...maybe not because preloading is always on the primary table?
-                fromAlias: "unset",
-                table: otherMeta.tableName,
-                query: {
-                    selects: [`json_agg(json_build_array(${selects.join(", ")}) order by ${orderBy}) as _`],
-                    tables: [
-                        { join: "primary", table: otherMeta.tableName, alias: otherAlias },
-                        ...(m2mTable ? [m2mTable] : []),
-                        ...subJoins.map((sj) => sj.join),
-                    ],
-                    condition: cb.toExpressionFilter(),
-                    orderBys: [],
-                },
-            };
-            // Pre-compute column names so we don't re-read them per entity
-            const columnNames = columns.map((c) => c.columnName);
-            // If we've snuck the m2m row id into the json array, ignore it (id-less tables have no id)
-            const m2mOffset = field.kind === "m2m" && field.hasJoinTableId ? 1 : 0;
-            const hydrator = (root, parent, arrays) => {
-                const { em } = root;
-                // If we had overlapping load hints, i.e. `author.books` for [a1, a2] and `author.comments` for [a1], and
-                // we're processing the arrays of comments, but for a root author like `a2` that didn't ask for our load
-                // hint, then skip it to keep the relation unloaded.
-                if (subTree.entitiesKind === "instances" && !subTree.entities.has(root))
-                    return;
-                if (subTree.entitiesKind === "ids" && !subTree.entities.has(root.idTagged))
-                    return;
-                // We get back an array of [[1, title], [2, title], [3, title]]
-                const children = arrays.map((array) => {
-                    const taggedId = (0, keys_1.keyToTaggedId)(otherMeta, array[m2mOffset]);
-                    const row = {};
-                    for (let i = 0; i < columns.length; i++) {
-                        row[columnNames[i]] = columns[i].mapFromJsonAgg(array[m2mOffset + i]);
-                    }
-                    const entity = em.findExistingInstance(taggedId) ??
-                        em.hydrate(otherMeta.cstr, [row], { overwriteExisting: false })[0];
-                    // Tell the internal JoinRow booking-keeping about this m2m row
-                    if (field.kind === "m2m") {
-                        // TODO This `addExisting` needs to be pulled up, out of the `arrays.map`, so we can do a `loadRows`-ish
-                        // call that passes all now-known m2m rows into JoinRows as a single list, so that it can mark any
-                        // deleted-from-under-us m2m rows as deleted.
-                        const m2m = parent[key];
-                        (0, EntityManager_1.getEmInternalApi)(em)
-                            .joinRows(m2m)
-                            .addPreloadedRow(m2m, field.hasJoinTableId ? array[0] : undefined, parent, entity);
-                    }
-                    // Within each child, look for grandchildren
-                    subJoins.forEach((sub, i) => {
-                        // array[i] could be null if there are no grandchildren, but still call `sub` to
-                        // process it so that we store the empty array into the em.joinLoadedRelations, to
-                        // avoid the relation.load method later doing a SQL for rows we know are not there.
-                        sub.hydrator(root, entity, array[m2mOffset + columns.length + i] ?? []);
-                    });
-                    return entity;
-                });
-                // Cache the entities so `.load`s will see them
-                (0, EntityManager_1.getEmInternalApi)(em).setPreloadedRelation(parent.idTagged, key, children);
-            };
-            results.push({ alias: otherAlias, relationAlias, join, hydrator });
-        }
-    });
-    return results;
+	const results = [];
+	Object.entries(tree.hints).forEach(([key, subTree]) => {
+		const field = parentMeta.allFields[key];
+		if (field && canPreload(parentMeta, field)) {
+			if (field.kind === "m2mEnum") {
+				results.push(calcEnumLateralJoin(assigner, root, subTree, parentAlias, field, key, pathPrefix));
+				return;
+			}
+			const otherMeta = field.otherMetadata();
+			const otherField = otherMeta.allFields[field.otherFieldName];
+			const otherAlias = `_${assigner.getAlias(otherMeta.tableName)}`;
+			const pathKey = key.toLowerCase();
+			const relationAlias = `_${assigner.getLiteralAlias(`${pathPrefix}${pathKey}`)}`;
+			const subJoins = calcLateralJoins(assigner, root, subTree, otherAlias, otherMeta, `${pathPrefix}${pathKey}_`);
+			const columns = Object.values(otherMeta.allFields).filter((f) => f.serde && !(f.kind === "primitive" && f.lazy)).flatMap((f) => f.serde.columns);
+			const selects = [...columns.map((c) => kqDot(otherAlias, c.columnName)), ...subJoins.map((sb) => kqDot(sb.alias, "_"))];
+			const aliasMaybeSuffix = kq(`${parentAlias}${field.aliasSuffix}`);
+			const cb = new ConditionBuilder();
+			let m2mTable;
+			let m2mAlias;
+			if (otherField.kind === "m2o") cb.addRawCondition({
+				aliases: [otherAlias, parentAlias],
+				condition: `${kqDot(otherAlias, otherField.serde.columns[0].columnName)} = ${kqDot(parentAlias, "id")}`,
+				pruneable: true
+			});
+			else if (otherField.kind === "poly") {
+				const comp = otherField.components.find((c) => parentMeta.cstr === c.otherMetadata().cstr) ?? fail(`No component found for ${field.fieldName} -> ${otherField.fieldName}`);
+				cb.addRawCondition({
+					aliases: [otherAlias, parentAlias],
+					condition: `${kqDot(otherAlias, comp.columnName)} = ${kqDot(parentAlias, "id")}`,
+					pruneable: true
+				});
+			} else if (otherField.kind === "o2m" || otherField.kind === "lo2m") cb.addRawCondition({
+				aliases: [otherAlias, aliasMaybeSuffix],
+				condition: `${kqDot(otherAlias, "id")} = ${aliasMaybeSuffix}.${kq(field.serde.columns[0].columnName)}`,
+				pruneable: true
+			});
+			else if (otherField.kind === "o2o") cb.addRawCondition({
+				aliases: [otherAlias, aliasMaybeSuffix],
+				condition: `${kqDot(otherAlias, "id")} = ${aliasMaybeSuffix}.${kq(field.serde.columns[0].columnName)}`,
+				pruneable: true
+			});
+			else if (otherField.kind === "m2m") {
+				m2mAlias = assigner.getAlias(otherField.joinTableName);
+				if (otherField.hasJoinTableId) selects.unshift(kqDot(m2mAlias, "id"));
+				m2mTable = {
+					join: "inner",
+					table: otherField.joinTableName,
+					alias: m2mAlias,
+					col1: kqDot(parentAlias, "id"),
+					col2: kqDot(m2mAlias, otherField.columnNames[1])
+				};
+				cb.addRawCondition({
+					aliases: [m2mAlias, otherAlias],
+					condition: `${kqDot(m2mAlias, otherField.columnNames[0])} = ${kqDot(otherAlias, "id")}`,
+					pruneable: true
+				});
+			} else throw new Error(`Unsupported otherField.kind ${otherField.kind}`);
+			if (subTree.entities.size !== root.tree.entities.size) cb.addRawCondition({
+				aliases: [root.alias],
+				condition: `${kqDot(root.alias, "id")} = ANY(?)`,
+				bindings: [[...subTree.entities].filter((e) => typeof e === "string" || !e.isNewEntity).map((e) => keyToNumber(root.meta, typeof e === "string" ? e : e.id))],
+				pruneable: true
+			});
+			const orderBy = otherField.kind === "m2m" && !otherField.hasJoinTableId ? `${kq(m2mAlias)}.${kq(otherField.columnNames[0])}` : `${kq(m2mAlias ?? otherAlias)}.id`;
+			const join = {
+				join: "lateral",
+				alias: otherAlias,
+				fromAlias: "unset",
+				table: otherMeta.tableName,
+				query: {
+					selects: [`json_agg(json_build_array(${selects.join(", ")}) order by ${orderBy}) as _`],
+					tables: [
+						{
+							join: "primary",
+							table: otherMeta.tableName,
+							alias: otherAlias
+						},
+						...m2mTable ? [m2mTable] : [],
+						...subJoins.map((sj) => sj.join)
+					],
+					condition: cb.toExpressionFilter(),
+					orderBys: []
+				}
+			};
+			const columnNames = columns.map((c) => c.columnName);
+			const m2mOffset = field.kind === "m2m" && field.hasJoinTableId ? 1 : 0;
+			const hydrator = (root, parent, arrays) => {
+				const { em } = root;
+				if (subTree.entitiesKind === "instances" && !subTree.entities.has(root)) return;
+				if (subTree.entitiesKind === "ids" && !subTree.entities.has(root.idTagged)) return;
+				const children = arrays.map((array) => {
+					const taggedId = keyToTaggedId(otherMeta, array[m2mOffset]);
+					const row = {};
+					for (let i = 0; i < columns.length; i++) row[columnNames[i]] = columns[i].mapFromJsonAgg(array[m2mOffset + i]);
+					const entity = em.findExistingInstance(taggedId) ?? em.hydrate(otherMeta.cstr, [row], { overwriteExisting: false })[0];
+					if (field.kind === "m2m") {
+						const m2m = parent[key];
+						getEmInternalApi(em).joinRows(m2m).addPreloadedRow(m2m, field.hasJoinTableId ? array[0] : void 0, parent, entity);
+					}
+					subJoins.forEach((sub, i) => {
+						sub.hydrator(root, entity, array[m2mOffset + columns.length + i] ?? []);
+					});
+					return entity;
+				});
+				getEmInternalApi(em).setPreloadedRelation(parent.idTagged, key, children);
+			};
+			results.push({
+				alias: otherAlias,
+				relationAlias,
+				join,
+				hydrator
+			});
+		}
+	});
+	return results;
 }
 /**
- * Builds the `CROSS JOIN LATERAL` that aggregates an enum-m2m join table (e.g. `publisher_logo_colors`)
- * into a json array of enum ids, e.g. `[[1], [3]]` (or `[[1, id], [3, id]]` for id-ful join tables).
- */
+* Builds the `CROSS JOIN LATERAL` that aggregates an enum-m2m join table (e.g. `publisher_logo_colors`)
+* into a json array of enum ids, e.g. `[[1], [3]]` (or `[[1, id], [3, id]]` for id-ful join tables).
+*/
 function calcEnumLateralJoin(assigner, root, subTree, parentAlias, field, key, pathPrefix) {
-    const [entityColumn, enumColumn] = field.columnNames;
-    const jtAlias = `_${assigner.getAlias(field.joinTableName)}`;
-    const relationAlias = `_${assigner.getLiteralAlias(`${pathPrefix}${key.toLowerCase()}`)}`;
-    const parts = [(0, keywords_1.kqDot)(jtAlias, enumColumn)];
-    if (field.hasJoinTableId)
-        parts.push((0, keywords_1.kqDot)(jtAlias, "id"));
-    const cb = new ConditionBuilder_1.ConditionBuilder();
-    cb.addRawCondition({
-        aliases: [jtAlias, parentAlias],
-        condition: `${(0, keywords_1.kqDot)(jtAlias, entityColumn)} = ${(0, keywords_1.kqDot)(parentAlias, "id")}`,
-        pruneable: true,
-    });
-    const needsSubSelect = subTree.entities.size !== root.tree.entities.size;
-    if (needsSubSelect) {
-        cb.addRawCondition({
-            aliases: [root.alias],
-            condition: `${(0, keywords_1.kqDot)(root.alias, "id")} = ANY(?)`,
-            bindings: [
-                [...subTree.entities]
-                    .filter((e) => typeof e === "string" || !e.isNewEntity)
-                    .map((e) => (0, keys_1.keyToNumber)(root.meta, typeof e === "string" ? e : e.id)),
-            ],
-            pruneable: true,
-        });
-    }
-    const orderBy = `${(0, keywords_1.kq)(jtAlias)}.${(0, keywords_1.kq)(field.hasJoinTableId ? "id" : enumColumn)}`;
-    const join = {
-        join: "lateral",
-        alias: jtAlias,
-        fromAlias: "unset",
-        table: field.joinTableName,
-        query: {
-            selects: [`json_agg(json_build_array(${parts.join(", ")}) order by ${orderBy}) as _`],
-            tables: [{ join: "primary", table: field.joinTableName, alias: jtAlias }],
-            condition: cb.toExpressionFilter(),
-            orderBys: [],
-        },
-    };
-    const hydrator = (root, parent, arrays) => {
-        const { em } = root;
-        if (subTree.entitiesKind === "instances" && !subTree.entities.has(root))
-            return;
-        if (subTree.entitiesKind === "ids" && !subTree.entities.has(root.idTagged))
-            return;
-        const like = {
-            entity: parent,
-            joinTableName: field.joinTableName,
-            columnName: entityColumn,
-            otherColumnName: enumColumn,
-            fieldName: key,
-            meta: (0, EntityMetadata_1.getMetadataForField)((0, EntityMetadata_1.getMetadata)(parent), key),
-            otherEnum: field.enumDetailType,
-            hasJoinTableId: field.hasJoinTableId,
-        };
-        const api = (0, EntityManager_1.getEmInternalApi)(em);
-        const joinRows = api.joinRows(like);
-        const codes = [];
-        for (const array of arrays) {
-            const enumId = array[0];
-            joinRows.addPreloadedRow(like, field.hasJoinTableId ? array[1] : undefined, parent, enumId);
-            codes.push(field.enumDetailType.findById(enumId).code);
-        }
-        api.setPreloadedRelation(parent.idTagged, key, codes);
-    };
-    return { alias: jtAlias, relationAlias, join, hydrator };
+	const [entityColumn, enumColumn] = field.columnNames;
+	const jtAlias = `_${assigner.getAlias(field.joinTableName)}`;
+	const relationAlias = `_${assigner.getLiteralAlias(`${pathPrefix}${key.toLowerCase()}`)}`;
+	const parts = [kqDot(jtAlias, enumColumn)];
+	if (field.hasJoinTableId) parts.push(kqDot(jtAlias, "id"));
+	const cb = new ConditionBuilder();
+	cb.addRawCondition({
+		aliases: [jtAlias, parentAlias],
+		condition: `${kqDot(jtAlias, entityColumn)} = ${kqDot(parentAlias, "id")}`,
+		pruneable: true
+	});
+	if (subTree.entities.size !== root.tree.entities.size) cb.addRawCondition({
+		aliases: [root.alias],
+		condition: `${kqDot(root.alias, "id")} = ANY(?)`,
+		bindings: [[...subTree.entities].filter((e) => typeof e === "string" || !e.isNewEntity).map((e) => keyToNumber(root.meta, typeof e === "string" ? e : e.id))],
+		pruneable: true
+	});
+	const orderBy = `${kq(jtAlias)}.${kq(field.hasJoinTableId ? "id" : enumColumn)}`;
+	const join = {
+		join: "lateral",
+		alias: jtAlias,
+		fromAlias: "unset",
+		table: field.joinTableName,
+		query: {
+			selects: [`json_agg(json_build_array(${parts.join(", ")}) order by ${orderBy}) as _`],
+			tables: [{
+				join: "primary",
+				table: field.joinTableName,
+				alias: jtAlias
+			}],
+			condition: cb.toExpressionFilter(),
+			orderBys: []
+		}
+	};
+	const hydrator = (root, parent, arrays) => {
+		const { em } = root;
+		if (subTree.entitiesKind === "instances" && !subTree.entities.has(root)) return;
+		if (subTree.entitiesKind === "ids" && !subTree.entities.has(root.idTagged)) return;
+		const like = {
+			entity: parent,
+			joinTableName: field.joinTableName,
+			columnName: entityColumn,
+			otherColumnName: enumColumn,
+			fieldName: key,
+			meta: getMetadataForField(getMetadata(parent), key),
+			otherEnum: field.enumDetailType,
+			hasJoinTableId: field.hasJoinTableId
+		};
+		const api = getEmInternalApi(em);
+		const joinRows = api.joinRows(like);
+		const codes = [];
+		for (const array of arrays) {
+			const enumId = array[0];
+			joinRows.addPreloadedRow(like, field.hasJoinTableId ? array[1] : void 0, parent, enumId);
+			codes.push(field.enumDetailType.findById(enumId).code);
+		}
+		api.setPreloadedRelation(parent.idTagged, key, codes);
+	};
+	return {
+		alias: jtAlias,
+		relationAlias,
+		join,
+		hydrator
+	};
+}
+/** Reads one column from either classic POJO rows or a lazy `RowData` result. */
+function readRowValue(rows, rowIndex, columnName) {
+	return Array.isArray(rows) ? rows[rowIndex][columnName] : rows.get(rowIndex, columnName);
 }
+//#endregion
+export { JsonAggregatePreloader };
+
 //# sourceMappingURL=JsonAggregatePreloader.js.map