joist-core 2.3.0 → 2.4.0-next.2

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

@@ -0,0 +1 @@
+{"version":3,"file":"oneToManyBatchLoader.d.mts","names":[],"sources":["../../src/batchloaders/oneToManyBatchLoader.ts"],"mappings":";;;;;;cAea;iBAEG,qBAAqB,UAAU,QAAQ,UAAU,QAC/D,IAAI,eACJ,YAAY,oBAAoB,GAAG,KAClC"}

package/build/batchloaders/oneToManyBatchLoader.js

@@ -1,51 +1,61 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.oneToManyLoadOperation = void 0;
-exports.oneToManyBatchLoader = oneToManyBatchLoader;
-const EntityManager_1 = require("../EntityManager");
-const fields_1 = require("../fields");
-const index_1 = require("../index");
-const utils_1 = require("../utils");
-exports.oneToManyLoadOperation = "o2m-load";
+import "./BatchLoader.js";
+import { getField } from "../fields.js";
+import { assertIdsAreTagged, deTagIds, maybeResolveReferenceToId } from "../keys.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
+import { abbreviation, groupBy } from "../utils.js";
+import "../index.js";
+import { getEmInternalApi } from "../EntityManager.js";
+import "../Entity.js";
+//#region src/batchloaders/oneToManyBatchLoader.ts
+const oneToManyLoadOperation = "o2m-load";
 function oneToManyBatchLoader(em, collection) {
-    const { meta: oneMeta, fieldName } = collection;
-    const batchKey = `${oneMeta.tableName}-${fieldName}`;
-    return em.getBatchLoader(exports.oneToManyLoadOperation, batchKey, async (_keys) => {
-        const { otherMeta: meta } = collection;
-        (0, index_1.assertIdsAreTagged)(_keys);
-        const keys = (0, index_1.deTagIds)(oneMeta, _keys);
-        const alias = (0, utils_1.abbreviation)(meta.tableName);
-        const o2m = oneMeta.allFields[collection.fieldName];
-        const other = meta.allFields[collection.otherFieldName];
-        const query = {
-            selects: [`"${alias}".*`],
-            tables: [{ alias, join: "primary", table: meta.tableName }],
-            condition: {
-                kind: "exp",
-                op: "and",
-                conditions: [
-                    {
-                        kind: "column",
-                        alias: `${alias}${other.aliasSuffix}`,
-                        column: o2m.otherColumnName,
-                        dbType: meta.idDbType,
-                        cond: { kind: "in", value: keys },
-                    },
-                ],
-            },
-            orderBys: [{ alias, column: "id", order: "ASC" }],
-        };
-        (0, index_1.addTablePerClassJoinsAndClassTag)(query, meta, alias, true);
-        const rows = await em["executeFind"](meta, exports.oneToManyLoadOperation, query, {});
-        const entities = em.hydrate(meta.cstr, rows);
-        const entitiesById = (0, utils_1.groupBy)(entities, (entity) => {
-            const ownerId = (0, index_1.maybeResolveReferenceToId)((0, fields_1.getField)(entity, collection.otherFieldName));
-            return ownerId ?? "dummyNoLongerOwned";
-        });
-        const api = (0, EntityManager_1.getEmInternalApi)(em);
-        for (const key of _keys) {
-            api.setPreloadedRelation(key, fieldName, entitiesById.get(key) || []);
-        }
-    });
+	const { meta: oneMeta, fieldName } = collection;
+	const batchKey = `${oneMeta.tableName}-${fieldName}`;
+	return em.getBatchLoader(oneToManyLoadOperation, batchKey, async (_keys) => {
+		const { otherMeta: meta } = collection;
+		assertIdsAreTagged(_keys);
+		const keys = deTagIds(oneMeta, _keys);
+		const alias = abbreviation(meta.tableName);
+		const o2m = oneMeta.allFields[collection.fieldName];
+		const other = meta.allFields[collection.otherFieldName];
+		const query = {
+			selects: [`"${alias}".*`],
+			tables: [{
+				alias,
+				join: "primary",
+				table: meta.tableName
+			}],
+			condition: {
+				kind: "exp",
+				op: "and",
+				conditions: [{
+					kind: "column",
+					alias: `${alias}${other.aliasSuffix}`,
+					column: o2m.otherColumnName,
+					dbType: meta.idDbType,
+					cond: {
+						kind: "in",
+						value: keys
+					}
+				}]
+			},
+			orderBys: [{
+				alias,
+				column: "id",
+				order: "ASC"
+			}]
+		};
+		addTablePerClassJoinsAndClassTag(query, meta, alias, true);
+		const rowData = await em["executeFindRowData"](meta, oneToManyLoadOperation, query, {});
+		const entities = em["hydrateAndFinalize"](meta.cstr, rowData);
+		const entitiesById = groupBy(entities, (entity) => {
+			return maybeResolveReferenceToId(getField(entity, collection.otherFieldName)) ?? "dummyNoLongerOwned";
+		});
+		const api = getEmInternalApi(em);
+		for (const key of _keys) api.setPreloadedRelation(key, fieldName, entitiesById.get(key) || []);
+	});
 }
+//#endregion
+export { oneToManyBatchLoader, oneToManyLoadOperation };
+
 //# sourceMappingURL=oneToManyBatchLoader.js.map

package/build/batchloaders/oneToManyBatchLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"oneToManyBatchLoader.js","sourceRoot":"","sources":["../../src/batchloaders/oneToManyBatchLoader.ts"],"names":[],"mappings":";;;AAiBA,oDAiDC;AAjED,oDAAmE;AACnE,sCAAqC;AACrC,oCAQkB;AAClB,oCAAiD;AAGpC,QAAA,sBAAsB,GAAG,UAAU,CAAC;AAEjD,SAAgB,oBAAoB,CAClC,EAAiB,EACjB,UAAqC;IAErC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;IAChD,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,SAAS,EAAE,CAAC;IACrD,OAAO,EAAE,CAAC,cAAc,CAAC,8BAAsB,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QACzE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QAEvC,IAAA,0BAAkB,EAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,IAAI,GAAG,IAAA,gBAAQ,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEtC,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAmB,CAAC;QACtE,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACxD,MAAM,KAAK,GAAoB;YAC7B,OAAO,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC;YACzB,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3D,SAAS,EAAE;gBACT,IAAI,EAAE,KAAK;gBACX,EAAE,EAAE,KAAK;gBACT,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,GAAG,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE;wBACrC,MAAM,EAAE,GAAG,CAAC,eAAe;wBAC3B,MAAM,EAAE,IAAI,CAAC,QAAQ;wBACrB,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;qBAClC;iBACF;aACF;YACD,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;SAClD,CAAC;QAEF,IAAA,wCAAgC,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAE3D,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,8BAAsB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE7C,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YAChD,MAAM,OAAO,GAAG,IAAA,iCAAyB,EAAC,IAAA,iBAAQ,EAAC,MAAM,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC;YACvF,OAAO,OAAO,IAAI,oBAAoB,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,IAAA,gCAAgB,EAAC,EAAE,CAAC,CAAC;QACjC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,GAAG,CAAC,oBAAoB,CAAC,GAAG,EAAE,SAAS,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"oneToManyBatchLoader.js","names":[],"sources":["../../src/batchloaders/oneToManyBatchLoader.ts"],"sourcesContent":["import { type BatchLoader } from \"src/batchloaders/BatchLoader.ts\";\nimport { type Entity } from \"src/Entity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"src/EntityManager.ts\";\nimport { getField } from \"src/fields.ts\";\nimport {\n  type OneToManyCollection,\n  type OneToManyField,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  assertIdsAreTagged,\n  deTagIds,\n  maybeResolveReferenceToId,\n} from \"src/index.ts\";\nimport { abbreviation, groupBy } from \"src/utils.ts\";\n\nexport const oneToManyLoadOperation = \"o2m-load\";\n\nexport function oneToManyBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: OneToManyCollection<T, U>,\n): BatchLoader<string> {\n  const { meta: oneMeta, fieldName } = collection;\n  const batchKey = `${oneMeta.tableName}-${fieldName}`;\n  return em.getBatchLoader(oneToManyLoadOperation, batchKey, async (_keys) => {\n    const { otherMeta: meta } = collection;\n\n    assertIdsAreTagged(_keys);\n    const keys = deTagIds(oneMeta, _keys);\n\n    const alias = abbreviation(meta.tableName);\n    const o2m = oneMeta.allFields[collection.fieldName] as OneToManyField;\n    const other = meta.allFields[collection.otherFieldName];\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: {\n        kind: \"exp\",\n        op: \"and\",\n        conditions: [\n          {\n            kind: \"column\",\n            alias: `${alias}${other.aliasSuffix}`,\n            column: o2m.otherColumnName,\n            dbType: meta.idDbType,\n            cond: { kind: \"in\", value: keys },\n          },\n        ],\n      },\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n\n    const rowData = await em[\"executeFindRowData\"](meta, oneToManyLoadOperation, query, {});\n    const entities = em[\"hydrateAndFinalize\"](meta.cstr, rowData);\n\n    const entitiesById = groupBy(entities, (entity) => {\n      const ownerId = maybeResolveReferenceToId(getField(entity, collection.otherFieldName));\n      return ownerId ?? \"dummyNoLongerOwned\";\n    });\n\n    const api = getEmInternalApi(em);\n    for (const key of _keys) {\n      api.setPreloadedRelation(key, fieldName, entitiesById.get(key) || []);\n    }\n  });\n}\n"],"mappings":";;;;;;;;;AAeA,MAAa,yBAAyB;AAEtC,SAAgB,qBACd,IACA,YACqB;CACrB,MAAM,EAAE,MAAM,SAAS,cAAc;CACrC,MAAM,WAAW,GAAG,QAAQ,UAAU,GAAG;CACzC,OAAO,GAAG,eAAe,wBAAwB,UAAU,OAAO,UAAU;EAC1E,MAAM,EAAE,WAAW,SAAS;EAE5B,mBAAmB,KAAK;EACxB,MAAM,OAAO,SAAS,SAAS,KAAK;EAEpC,MAAM,QAAQ,aAAa,KAAK,SAAS;EACzC,MAAM,MAAM,QAAQ,UAAU,WAAW;EACzC,MAAM,QAAQ,KAAK,UAAU,WAAW;EACxC,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,CACV;KACE,MAAM;KACN,OAAO,GAAG,QAAQ,MAAM;KACxB,QAAQ,IAAI;KACZ,QAAQ,KAAK;KACb,MAAM;MAAE,MAAM;MAAM,OAAO;KAAK;IAClC,CACF;GACF;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;EAClD;EAEA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,wBAAwB,OAAO,CAAC,CAAC;EACtF,MAAM,WAAW,GAAG,qBAAqB,CAAC,KAAK,MAAM,OAAO;EAE5D,MAAM,eAAe,QAAQ,WAAW,WAAW;GAEjD,OADgB,0BAA0B,SAAS,QAAQ,WAAW,cAAc,CACvE,KAAK;EACpB,CAAC;EAED,MAAM,MAAM,iBAAiB,EAAE;EAC/B,KAAK,MAAM,OAAO,OAChB,IAAI,qBAAqB,KAAK,WAAW,aAAa,IAAI,GAAG,KAAK,CAAC,CAAC;CAExE,CAAC;AACH"}

package/build/batchloaders/oneToOneBatchLoader.cjs

@@ -0,0 +1,64 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+require("./BatchLoader.cjs");
+const require_fields = require("../fields.cjs");
+const require_keys = require("../keys.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
+require("../relations/OneToOneReference.cjs");
+const require_utils = require("../utils.cjs");
+const require_EntityMetadata = require("../EntityMetadata.cjs");
+require("../index.cjs");
+const require_EntityManager = require("../EntityManager.cjs");
+require("../Entity.cjs");
+//#region src/batchloaders/oneToOneBatchLoader.ts
+const oneToOneLoadOperation = "o2o-load";
+function oneToOneBatchLoader(em, reference) {
+	const meta = require_EntityMetadata.getMetadata(reference.entity);
+	const batchKey = `${meta.tableName}-${reference.fieldName}`;
+	return em.getBatchLoader(oneToOneLoadOperation, batchKey, async (_keys) => {
+		const { otherMeta, otherFieldName } = reference;
+		require_keys.assertIdsAreTagged(_keys);
+		const keys = require_keys.deTagIds(meta, _keys);
+		const alias = require_utils.abbreviation(otherMeta.tableName);
+		const o2o = meta.allFields[reference.fieldName];
+		const other = otherMeta.allFields[reference.otherFieldName];
+		const query = {
+			selects: [`"${alias}".*`],
+			tables: [{
+				alias,
+				join: "primary",
+				table: otherMeta.tableName
+			}],
+			condition: {
+				kind: "exp",
+				op: "and",
+				conditions: [{
+					kind: "column",
+					alias: `${alias}${other.aliasSuffix}`,
+					column: o2o.otherColumnName,
+					dbType: meta.idDbType,
+					cond: {
+						kind: "in",
+						value: keys
+					}
+				}]
+			},
+			orderBys: []
+		};
+		require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, otherMeta, alias, true);
+		const rowData = await em["executeFindRowData"](otherMeta, oneToOneLoadOperation, query, {});
+		const entities = em["hydrateAndFinalize"](otherMeta.cstr, rowData);
+		const entitiesByOtherId = require_utils.groupBy(entities, (entity) => {
+			return require_keys.maybeResolveReferenceToId(require_fields.getField(entity, otherFieldName)) ?? "dummyNoLongerOwned";
+		});
+		const api = require_EntityManager.getEmInternalApi(em);
+		for (const key of _keys) {
+			const found = entitiesByOtherId.get(key);
+			api.setPreloadedRelation(key, reference.fieldName, found ? [found[0]] : []);
+		}
+	});
+}
+//#endregion
+exports.oneToOneBatchLoader = oneToOneBatchLoader;
+exports.oneToOneLoadOperation = oneToOneLoadOperation;
+
+//# sourceMappingURL=oneToOneBatchLoader.cjs.map

package/build/batchloaders/oneToOneBatchLoader.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"oneToOneBatchLoader.cjs","names":["getMetadata","deTagIds","abbreviation","groupBy","maybeResolveReferenceToId","getField","getEmInternalApi"],"sources":["../../src/batchloaders/oneToOneBatchLoader.ts"],"sourcesContent":["import { type BatchLoader } from \"src/batchloaders/BatchLoader.ts\";\nimport { type Entity } from \"src/Entity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"src/EntityManager.ts\";\nimport { type OneToOneField, getMetadata } from \"src/EntityMetadata.ts\";\nimport { getField } from \"src/fields.ts\";\nimport {\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  assertIdsAreTagged,\n  deTagIds,\n  maybeResolveReferenceToId,\n} from \"src/index.ts\";\nimport { type OneToOneReferenceImpl } from \"src/relations/OneToOneReference.ts\";\nimport { abbreviation, groupBy } from \"src/utils.ts\";\n\nexport const oneToOneLoadOperation = \"o2o-load\";\n\nexport function oneToOneBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  reference: OneToOneReferenceImpl<T, U>,\n): BatchLoader<string> {\n  const meta = getMetadata(reference.entity);\n  const batchKey = `${meta.tableName}-${reference.fieldName}`;\n  return em.getBatchLoader(oneToOneLoadOperation, batchKey, async (_keys) => {\n    const { otherMeta, otherFieldName } = reference;\n\n    assertIdsAreTagged(_keys);\n    const keys = deTagIds(meta, _keys);\n\n    const alias = abbreviation(otherMeta.tableName);\n    const o2o = meta.allFields[reference.fieldName] as OneToOneField;\n    const other = otherMeta.allFields[reference.otherFieldName];\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: otherMeta.tableName }],\n      condition: {\n        kind: \"exp\",\n        op: \"and\",\n        conditions: [\n          {\n            kind: \"column\",\n            alias: `${alias}${other.aliasSuffix}`,\n            column: o2o.otherColumnName,\n            dbType: meta.idDbType,\n            cond: { kind: \"in\", value: keys },\n          },\n        ],\n      },\n      orderBys: [],\n    };\n    addTablePerClassJoinsAndClassTag(query, otherMeta, alias, true);\n\n    const rowData = await em[\"executeFindRowData\"](otherMeta, oneToOneLoadOperation, query, {});\n    const entities = em[\"hydrateAndFinalize\"](otherMeta.cstr, rowData);\n\n    const entitiesByOtherId = groupBy(entities, (entity) => {\n      const ownerId = maybeResolveReferenceToId(getField(entity, otherFieldName));\n      return ownerId ?? \"dummyNoLongerOwned\";\n    });\n\n    const api = getEmInternalApi(em);\n    for (const key of _keys) {\n      const found = entitiesByOtherId.get(key);\n      api.setPreloadedRelation(key, reference.fieldName as string, found ? [found[0]] : []);\n    }\n  });\n}\n"],"mappings":";;;;;;;;;;;;AAeA,MAAa,wBAAwB;AAErC,SAAgB,oBACd,IACA,WACqB;CACrB,MAAM,OAAOA,uBAAAA,YAAY,UAAU,MAAM;CACzC,MAAM,WAAW,GAAG,KAAK,UAAU,GAAG,UAAU;CAChD,OAAO,GAAG,eAAe,uBAAuB,UAAU,OAAO,UAAU;EACzE,MAAM,EAAE,WAAW,mBAAmB;EAEtC,aAAA,mBAAmB,KAAK;EACxB,MAAM,OAAOC,aAAAA,SAAS,MAAM,KAAK;EAEjC,MAAM,QAAQC,cAAAA,aAAa,UAAU,SAAS;EAC9C,MAAM,MAAM,KAAK,UAAU,UAAU;EACrC,MAAM,QAAQ,UAAU,UAAU,UAAU;EAC5C,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,UAAU;GAAU,CAAC;GAC/D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,CACV;KACE,MAAM;KACN,OAAO,GAAG,QAAQ,MAAM;KACxB,QAAQ,IAAI;KACZ,QAAQ,KAAK;KACb,MAAM;MAAE,MAAM;MAAM,OAAO;KAAK;IAClC,CACF;GACF;GACA,UAAU,CAAC;EACb;EACA,iCAAA,iCAAiC,OAAO,WAAW,OAAO,IAAI;EAE9D,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,WAAW,uBAAuB,OAAO,CAAC,CAAC;EAC1F,MAAM,WAAW,GAAG,qBAAqB,CAAC,UAAU,MAAM,OAAO;EAEjE,MAAM,oBAAoBC,cAAAA,QAAQ,WAAW,WAAW;GAEtD,OADgBC,aAAAA,0BAA0BC,eAAAA,SAAS,QAAQ,cAAc,CAC5D,KAAK;EACpB,CAAC;EAED,MAAM,MAAMC,sBAAAA,iBAAiB,EAAE;EAC/B,KAAK,MAAM,OAAO,OAAO;GACvB,MAAM,QAAQ,kBAAkB,IAAI,GAAG;GACvC,IAAI,qBAAqB,KAAK,UAAU,WAAqB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;EACtF;CACF,CAAC;AACH"}

package/build/batchloaders/oneToOneBatchLoader.d.cts

@@ -0,0 +1,10 @@
+import { BatchLoader } from "./BatchLoader.cjs";
+import { OneToOneReferenceImpl } from "../relations/OneToOneReference.cjs";
+import { EntityManager } from "../EntityManager.cjs";
+import { Entity } from "../Entity.cjs";
+//#region src/batchloaders/oneToOneBatchLoader.d.ts
+declare const oneToOneLoadOperation = "o2o-load";
+declare function oneToOneBatchLoader<T extends Entity, U extends Entity>(em: EntityManager, reference: OneToOneReferenceImpl<T, U>): BatchLoader<string>;
+//#endregion
+export { oneToOneBatchLoader, oneToOneLoadOperation };
+//# sourceMappingURL=oneToOneBatchLoader.d.cts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"oneToOneBatchLoader.d.cts","names":[],"sources":["../../src/batchloaders/oneToOneBatchLoader.ts"],"mappings":";;;;;cAea;iBAEG,oBAAoB,UAAU,QAAQ,UAAU,QAC9D,IAAI,eACJ,WAAW,sBAAsB,GAAG,KACnC"}

package/build/batchloaders/oneToOneBatchLoader.d.mts

@@ -0,0 +1,10 @@
+import { BatchLoader } from "./BatchLoader.mjs";
+import { OneToOneReferenceImpl } from "../relations/OneToOneReference.mjs";
+import { EntityManager } from "../EntityManager.mjs";
+import { Entity } from "../Entity.mjs";
+//#region src/batchloaders/oneToOneBatchLoader.d.ts
+declare const oneToOneLoadOperation = "o2o-load";
+declare function oneToOneBatchLoader<T extends Entity, U extends Entity>(em: EntityManager, reference: OneToOneReferenceImpl<T, U>): BatchLoader<string>;
+//#endregion
+export { oneToOneBatchLoader, oneToOneLoadOperation };
+//# sourceMappingURL=oneToOneBatchLoader.d.mts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"oneToOneBatchLoader.d.mts","names":[],"sources":["../../src/batchloaders/oneToOneBatchLoader.ts"],"mappings":";;;;;cAea;iBAEG,oBAAoB,UAAU,QAAQ,UAAU,QAC9D,IAAI,eACJ,WAAW,sBAAsB,GAAG,KACnC"}

package/build/batchloaders/oneToOneBatchLoader.js

@@ -1,53 +1,62 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.oneToOneLoadOperation = void 0;
-exports.oneToOneBatchLoader = oneToOneBatchLoader;
-const EntityManager_1 = require("../EntityManager");
-const EntityMetadata_1 = require("../EntityMetadata");
-const fields_1 = require("../fields");
-const index_1 = require("../index");
-const utils_1 = require("../utils");
-exports.oneToOneLoadOperation = "o2o-load";
+import "./BatchLoader.js";
+import { getField } from "../fields.js";
+import { assertIdsAreTagged, deTagIds, maybeResolveReferenceToId } from "../keys.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
+import "../relations/OneToOneReference.js";
+import { abbreviation, groupBy } from "../utils.js";
+import { getMetadata } from "../EntityMetadata.js";
+import "../index.js";
+import { getEmInternalApi } from "../EntityManager.js";
+import "../Entity.js";
+//#region src/batchloaders/oneToOneBatchLoader.ts
+const oneToOneLoadOperation = "o2o-load";
 function oneToOneBatchLoader(em, reference) {
-    const meta = (0, EntityMetadata_1.getMetadata)(reference.entity);
-    const batchKey = `${meta.tableName}-${reference.fieldName}`;
-    return em.getBatchLoader(exports.oneToOneLoadOperation, batchKey, async (_keys) => {
-        const { otherMeta, otherFieldName } = reference;
-        (0, index_1.assertIdsAreTagged)(_keys);
-        const keys = (0, index_1.deTagIds)(meta, _keys);
-        const alias = (0, utils_1.abbreviation)(otherMeta.tableName);
-        const o2o = meta.allFields[reference.fieldName];
-        const other = otherMeta.allFields[reference.otherFieldName];
-        const query = {
-            selects: [`"${alias}".*`],
-            tables: [{ alias, join: "primary", table: otherMeta.tableName }],
-            condition: {
-                kind: "exp",
-                op: "and",
-                conditions: [
-                    {
-                        kind: "column",
-                        alias: `${alias}${other.aliasSuffix}`,
-                        column: o2o.otherColumnName,
-                        dbType: meta.idDbType,
-                        cond: { kind: "in", value: keys },
-                    },
-                ],
-            },
-            orderBys: [],
-        };
-        (0, index_1.addTablePerClassJoinsAndClassTag)(query, otherMeta, alias, true);
-        const rows = await em["executeFind"](otherMeta, exports.oneToOneLoadOperation, query, {});
-        const entities = em.hydrate(otherMeta.cstr, rows);
-        const entitiesByOtherId = (0, utils_1.groupBy)(entities, (entity) => {
-            const ownerId = (0, index_1.maybeResolveReferenceToId)((0, fields_1.getField)(entity, otherFieldName));
-            return ownerId ?? "dummyNoLongerOwned";
-        });
-        const api = (0, EntityManager_1.getEmInternalApi)(em);
-        for (const key of _keys) {
-            const found = entitiesByOtherId.get(key);
-            api.setPreloadedRelation(key, reference.fieldName, found ? [found[0]] : []);
-        }
-    });
+	const meta = getMetadata(reference.entity);
+	const batchKey = `${meta.tableName}-${reference.fieldName}`;
+	return em.getBatchLoader(oneToOneLoadOperation, batchKey, async (_keys) => {
+		const { otherMeta, otherFieldName } = reference;
+		assertIdsAreTagged(_keys);
+		const keys = deTagIds(meta, _keys);
+		const alias = abbreviation(otherMeta.tableName);
+		const o2o = meta.allFields[reference.fieldName];
+		const other = otherMeta.allFields[reference.otherFieldName];
+		const query = {
+			selects: [`"${alias}".*`],
+			tables: [{
+				alias,
+				join: "primary",
+				table: otherMeta.tableName
+			}],
+			condition: {
+				kind: "exp",
+				op: "and",
+				conditions: [{
+					kind: "column",
+					alias: `${alias}${other.aliasSuffix}`,
+					column: o2o.otherColumnName,
+					dbType: meta.idDbType,
+					cond: {
+						kind: "in",
+						value: keys
+					}
+				}]
+			},
+			orderBys: []
+		};
+		addTablePerClassJoinsAndClassTag(query, otherMeta, alias, true);
+		const rowData = await em["executeFindRowData"](otherMeta, oneToOneLoadOperation, query, {});
+		const entities = em["hydrateAndFinalize"](otherMeta.cstr, rowData);
+		const entitiesByOtherId = groupBy(entities, (entity) => {
+			return maybeResolveReferenceToId(getField(entity, otherFieldName)) ?? "dummyNoLongerOwned";
+		});
+		const api = getEmInternalApi(em);
+		for (const key of _keys) {
+			const found = entitiesByOtherId.get(key);
+			api.setPreloadedRelation(key, reference.fieldName, found ? [found[0]] : []);
+		}
+	});
 }
+//#endregion
+export { oneToOneBatchLoader, oneToOneLoadOperation };
+
 //# sourceMappingURL=oneToOneBatchLoader.js.map

package/build/batchloaders/oneToOneBatchLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"oneToOneBatchLoader.js","sourceRoot":"","sources":["../../src/batchloaders/oneToOneBatchLoader.ts"],"names":[],"mappings":";;;AAiBA,kDAiDC;AAjED,oDAAmE;AACnE,sDAA+D;AAC/D,sCAAqC;AACrC,oCAMkB;AAElB,oCAAiD;AAGpC,QAAA,qBAAqB,GAAG,UAAU,CAAC;AAEhD,SAAgB,mBAAmB,CACjC,EAAiB,EACjB,SAAsC;IAEtC,MAAM,IAAI,GAAG,IAAA,4BAAW,EAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;IAC5D,OAAO,EAAE,CAAC,cAAc,CAAC,6BAAqB,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QACxE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;QAEhD,IAAA,0BAAkB,EAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,IAAI,GAAG,IAAA,gBAAQ,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEnC,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAkB,CAAC;QACjE,MAAM,KAAK,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAoB;YAC7B,OAAO,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC;YACzB,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;YAChE,SAAS,EAAE;gBACT,IAAI,EAAE,KAAK;gBACX,EAAE,EAAE,KAAK;gBACT,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,GAAG,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE;wBACrC,MAAM,EAAE,GAAG,CAAC,eAAe;wBAC3B,MAAM,EAAE,IAAI,CAAC,QAAQ;wBACrB,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;qBAClC;iBACF;aACF;YACD,QAAQ,EAAE,EAAE;SACb,CAAC;QACF,IAAA,wCAAgC,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAEhE,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,SAAS,EAAE,6BAAqB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAClF,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAElD,MAAM,iBAAiB,GAAG,IAAA,eAAO,EAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACrD,MAAM,OAAO,GAAG,IAAA,iCAAyB,EAAC,IAAA,iBAAQ,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;YAC5E,OAAO,OAAO,IAAI,oBAAoB,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,IAAA,gCAAgB,EAAC,EAAE,CAAC,CAAC;QACjC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACzC,GAAG,CAAC,oBAAoB,CAAC,GAAG,EAAE,SAAS,CAAC,SAAmB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACxF,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"oneToOneBatchLoader.js","names":[],"sources":["../../src/batchloaders/oneToOneBatchLoader.ts"],"sourcesContent":["import { type BatchLoader } from \"src/batchloaders/BatchLoader.ts\";\nimport { type Entity } from \"src/Entity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"src/EntityManager.ts\";\nimport { type OneToOneField, getMetadata } from \"src/EntityMetadata.ts\";\nimport { getField } from \"src/fields.ts\";\nimport {\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  assertIdsAreTagged,\n  deTagIds,\n  maybeResolveReferenceToId,\n} from \"src/index.ts\";\nimport { type OneToOneReferenceImpl } from \"src/relations/OneToOneReference.ts\";\nimport { abbreviation, groupBy } from \"src/utils.ts\";\n\nexport const oneToOneLoadOperation = \"o2o-load\";\n\nexport function oneToOneBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  reference: OneToOneReferenceImpl<T, U>,\n): BatchLoader<string> {\n  const meta = getMetadata(reference.entity);\n  const batchKey = `${meta.tableName}-${reference.fieldName}`;\n  return em.getBatchLoader(oneToOneLoadOperation, batchKey, async (_keys) => {\n    const { otherMeta, otherFieldName } = reference;\n\n    assertIdsAreTagged(_keys);\n    const keys = deTagIds(meta, _keys);\n\n    const alias = abbreviation(otherMeta.tableName);\n    const o2o = meta.allFields[reference.fieldName] as OneToOneField;\n    const other = otherMeta.allFields[reference.otherFieldName];\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: otherMeta.tableName }],\n      condition: {\n        kind: \"exp\",\n        op: \"and\",\n        conditions: [\n          {\n            kind: \"column\",\n            alias: `${alias}${other.aliasSuffix}`,\n            column: o2o.otherColumnName,\n            dbType: meta.idDbType,\n            cond: { kind: \"in\", value: keys },\n          },\n        ],\n      },\n      orderBys: [],\n    };\n    addTablePerClassJoinsAndClassTag(query, otherMeta, alias, true);\n\n    const rowData = await em[\"executeFindRowData\"](otherMeta, oneToOneLoadOperation, query, {});\n    const entities = em[\"hydrateAndFinalize\"](otherMeta.cstr, rowData);\n\n    const entitiesByOtherId = groupBy(entities, (entity) => {\n      const ownerId = maybeResolveReferenceToId(getField(entity, otherFieldName));\n      return ownerId ?? \"dummyNoLongerOwned\";\n    });\n\n    const api = getEmInternalApi(em);\n    for (const key of _keys) {\n      const found = entitiesByOtherId.get(key);\n      api.setPreloadedRelation(key, reference.fieldName as string, found ? [found[0]] : []);\n    }\n  });\n}\n"],"mappings":";;;;;;;;;;;AAeA,MAAa,wBAAwB;AAErC,SAAgB,oBACd,IACA,WACqB;CACrB,MAAM,OAAO,YAAY,UAAU,MAAM;CACzC,MAAM,WAAW,GAAG,KAAK,UAAU,GAAG,UAAU;CAChD,OAAO,GAAG,eAAe,uBAAuB,UAAU,OAAO,UAAU;EACzE,MAAM,EAAE,WAAW,mBAAmB;EAEtC,mBAAmB,KAAK;EACxB,MAAM,OAAO,SAAS,MAAM,KAAK;EAEjC,MAAM,QAAQ,aAAa,UAAU,SAAS;EAC9C,MAAM,MAAM,KAAK,UAAU,UAAU;EACrC,MAAM,QAAQ,UAAU,UAAU,UAAU;EAC5C,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,UAAU;GAAU,CAAC;GAC/D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,CACV;KACE,MAAM;KACN,OAAO,GAAG,QAAQ,MAAM;KACxB,QAAQ,IAAI;KACZ,QAAQ,KAAK;KACb,MAAM;MAAE,MAAM;MAAM,OAAO;KAAK;IAClC,CACF;GACF;GACA,UAAU,CAAC;EACb;EACA,iCAAiC,OAAO,WAAW,OAAO,IAAI;EAE9D,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,WAAW,uBAAuB,OAAO,CAAC,CAAC;EAC1F,MAAM,WAAW,GAAG,qBAAqB,CAAC,UAAU,MAAM,OAAO;EAEjE,MAAM,oBAAoB,QAAQ,WAAW,WAAW;GAEtD,OADgB,0BAA0B,SAAS,QAAQ,cAAc,CAC5D,KAAK;EACpB,CAAC;EAED,MAAM,MAAM,iBAAiB,EAAE;EAC/B,KAAK,MAAM,OAAO,OAAO;GACvB,MAAM,QAAQ,kBAAkB,IAAI,GAAG;GACvC,IAAI,qBAAqB,KAAK,UAAU,WAAqB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;EACtF;CACF,CAAC;AACH"}

package/build/batchloaders/populateBatchLoader.cjs

@@ -0,0 +1,155 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+require("./BatchLoader.cjs");
+const require_normalizeHints = require("../normalizeHints.cjs");
+const require_reactivity_reactiveHints = require("../reactivity/reactiveHints.cjs");
+const require_keys = require("../keys.cjs");
+const require_queries_sql_keywords = require("../queries/sql/keywords.cjs");
+const require_batchloaders_manyToManyBatchLoader = require("./manyToManyBatchLoader.cjs");
+const require_batchloaders_oneToManyBatchLoader = require("./oneToManyBatchLoader.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
+const require_batchloaders_oneToOneBatchLoader = require("./oneToOneBatchLoader.cjs");
+const require_relations_ReactiveField = require("../relations/ReactiveField.cjs");
+const require_utils = require("../utils.cjs");
+require("../EntityMetadata.cjs");
+const require_queries_sql_AliasAssigner = require("../queries/sql/AliasAssigner.cjs");
+const require_loading_HintTree = require("../loading/HintTree.cjs");
+require("../index.cjs");
+const require_batchloaders_loadBatchLoader = require("./loadBatchLoader.cjs");
+const require_EntityManager = require("../EntityManager.cjs");
+require("../Entity.cjs");
+//#region src/batchloaders/populateBatchLoader.ts
+const populateOperation = "populate";
+function populateBatchLoader(em, meta, hint, mode, opts = {}) {
+	const batchKey = mode === "preload" ? `${meta.tagName}:${opts.forceReload}` : `${meta.tagName}:${require_normalizeHints.hintKey(hint)}:${opts.forceReload}`;
+	return em.getBatchLoader(populateOperation, batchKey, async (populates) => {
+		async function populateLayer(layerMeta, layerNode) {
+			const { preloader } = require_EntityManager.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 require_queries_sql_AliasAssigner.AliasAssigner();
+					const meta = layerMeta;
+					const alias = assigner.getAlias(meta.tableName);
+					const entities = [...layerNode.entities].filter((e) => !e.isNewEntity);
+					const ids = entities.map((e) => require_keys.keyToNumber(meta, e.id));
+					const query = {
+						selects: [require_queries_sql_keywords.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: []
+					};
+					require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, false);
+					const hydrator = preloader.addPreloading(meta, layerNode, query);
+					if (hydrator) {
+						const rows = await em["executeFind"](meta, populateOperation, query, {});
+						const entitiesById = require_utils.indexBy(entities, (e) => require_keys.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 = require_reactivity_reactiveHints.isPolyHint(key);
+				let loader;
+				let batchPromise;
+				for (const entity of tree.entities) {
+					const relation = isPoly ? require_reactivity_reactiveHints.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 require_relations_ReactiveField.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 ??= require_batchloaders_oneToManyBatchLoader.oneToManyBatchLoader(em, relation)).load(entity.idTagged);
+							relationsToPreload.push(relation);
+							continue;
+						} else if (field.kind === "m2m" && !field.derived) {
+							batchPromise = (loader ??= require_batchloaders_manyToManyBatchLoader.manyToManyBatchLoader(em, relation)).load(`${relation.columnName}=${entity.id}`);
+							relationsToPreload.push(relation);
+							continue;
+						} else if (field.kind === "o2o") {
+							batchPromise = (loader ??= require_batchloaders_oneToOneBatchLoader.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 ??= require_batchloaders_loadBatchLoader.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 = require_reactivity_reactiveHints.getRelationFromMaybePolyKey(entity, key);
+					childrenByParent.set(entity, relation ? require_utils.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, require_loading_HintTree.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;
+}
+//#endregion
+exports.populateBatchLoader = populateBatchLoader;
+exports.populateOperation = populateOperation;
+
+//# sourceMappingURL=populateBatchLoader.cjs.map

package/build/batchloaders/populateBatchLoader.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"populateBatchLoader.cjs","names":["hintKey","getEmInternalApi","AliasAssigner","keyToNumber","kqDot","indexBy","isPolyHint","getRelationFromMaybePolyKey","ReactiveFieldImpl","oneToManyBatchLoader","manyToManyBatchLoader","oneToOneBatchLoader","loadBatchLoader","toArray","buildHintTree"],"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/populateBatchLoader.d.cts

@@ -0,0 +1,17 @@
+import { BatchLoader } from "./BatchLoader.cjs";
+import { LoadHint } from "../loading/loadHints.cjs";
+import { EntityMetadata } from "../EntityMetadata.cjs";
+import "../index.cjs";
+import { EntityManager } from "../EntityManager.cjs";
+import { Entity } from "../Entity.cjs";
+//#region src/batchloaders/populateBatchLoader.d.ts
+declare const populateOperation = "populate";
+declare function populateBatchLoader(em: EntityManager, meta: EntityMetadata, hint: LoadHint<any>, mode: "preload" | "intermixed", opts?: {
+  forceReload?: boolean;
+}): BatchLoader<{
+  entity: Entity;
+  hint: LoadHint<any>;
+}>;
+//#endregion
+export { populateBatchLoader, populateOperation };
+//# sourceMappingURL=populateBatchLoader.d.cts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"populateBatchLoader.d.cts","names":[],"sources":["../../src/batchloaders/populateBatchLoader.ts"],"mappings":";;;;;;;cAwBa;iBAEG,oBACd,IAAI,eACJ,MAAM,gBACN,MAAM,eACN,gCACA;EAAQ;IACP;EAAc,QAAQ;EAAQ,MAAM"}

package/build/batchloaders/populateBatchLoader.d.mts

@@ -0,0 +1,17 @@
+import { BatchLoader } from "./BatchLoader.mjs";
+import { LoadHint } from "../loading/loadHints.mjs";
+import { EntityMetadata } from "../EntityMetadata.mjs";
+import "../index.mjs";
+import { EntityManager } from "../EntityManager.mjs";
+import { Entity } from "../Entity.mjs";
+//#region src/batchloaders/populateBatchLoader.d.ts
+declare const populateOperation = "populate";
+declare function populateBatchLoader(em: EntityManager, meta: EntityMetadata, hint: LoadHint<any>, mode: "preload" | "intermixed", opts?: {
+  forceReload?: boolean;
+}): BatchLoader<{
+  entity: Entity;
+  hint: LoadHint<any>;
+}>;
+//#endregion
+export { populateBatchLoader, populateOperation };
+//# sourceMappingURL=populateBatchLoader.d.mts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"populateBatchLoader.d.mts","names":[],"sources":["../../src/batchloaders/populateBatchLoader.ts"],"mappings":";;;;;;;cAwBa;iBAEG,oBACd,IAAI,eACJ,MAAM,gBACN,MAAM,eACN,gCACA;EAAQ;IACP;EAAc,QAAQ;EAAQ,MAAM"}