joist-core 2.3.0 → 2.4.0-next.2

package/build/dataloaders/findOrCreateDataLoader.d.mts

@@ -0,0 +1,15 @@
+import { OptsOf } from "../typeMap.mjs";
+import { EntityConstructor, EntityManager } from "../EntityManager.mjs";
+import { Entity } from "../Entity.mjs";
+import DataLoader from "dataloader";
+//#region src/dataloaders/findOrCreateDataLoader.d.ts
+interface FindOrCreateKey<T extends Entity> {
+  ifNew: OptsOf<T>;
+  upsert: Partial<OptsOf<T>> | undefined;
+}
+declare function findOrCreateDataLoader<T extends Entity>(em: EntityManager, type: EntityConstructor<T>, where: Partial<OptsOf<T>>, softDeletes: "include" | "exclude"): DataLoader<FindOrCreateKey<T>, T>;
+/** A simple in-memory match of `entity` against a mini/flat "WHERE clause" of `opts`. */
+declare function entityMatches<T extends Entity>(entity: T, opts: Partial<OptsOf<T>>): boolean;
+//#endregion
+export { entityMatches, findOrCreateDataLoader };
+//# sourceMappingURL=findOrCreateDataLoader.d.mts.map

package/build/dataloaders/findOrCreateDataLoader.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findOrCreateDataLoader.d.mts","names":[],"sources":["../../src/dataloaders/findOrCreateDataLoader.ts"],"mappings":";;;;;UAUU,gBAAgB,UAAU;EAClC,OAAO,OAAO;EACd,QAAQ,QAAQ,OAAO;;iBAGT,uBAAuB,UAAU,QAC/C,IAAI,eACJ,MAAM,kBAAkB,IACxB,OAAO,QAAQ,OAAO,KACtB,qCACC,WAAW,gBAAgB,IAAI;;iBAiGlB,cAAc,UAAU,QAAQ,QAAQ,GAAG,MAAM,QAAQ,OAAO"}

package/build/dataloaders/findOrCreateDataLoader.js

@@ -1,180 +1,118 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findOrCreateDataLoader = findOrCreateDataLoader;
-exports.entityMatches = entityMatches;
-const Entity_1 = require("../Entity");
-const EntityManager_1 = require("../EntityManager");
-const EntityMetadata_1 = require("../EntityMetadata");
-const relations_1 = require("../relations");
-const resurrection_1 = require("../resurrection");
-const utils_1 = require("../utils");
-const findDataLoader_1 = require("./findDataLoader");
+import { isLoadedReference } from "../relations/Reference.js";
+import "../relations/index.js";
+import { cleanStringValue, fail } from "../utils.js";
+import { getMetadata } from "../EntityMetadata.js";
+import { whereFilterHash } from "./findDataLoader.js";
+import { resurrectIfSoftDeleted } from "../resurrection.js";
+import { TooManyError, sameEntity } from "../EntityManager.js";
+import { isEntity } from "../Entity.js";
+//#region src/dataloaders/findOrCreateDataLoader.ts
 function findOrCreateDataLoader(em, type, where, softDeletes) {
-    const meta = (0, EntityMetadata_1.getMetadata)(type);
-    // Do some extra logic to make unclean strings/citext not create duplicate entities
-    const hasAnyStrings = Object.values(meta.allFields).some((f) => f.kind === "primitive" && f.type === "string");
-    const hasAnyCitext = Object.values(meta.allFields).some((f) => f.kind === "primitive" && f.citext);
-    // The `where` here will be later used to `em.create`, so we only clean (not lower for citext)
-    where = hasAnyStrings ? maybeClean(meta, where) : where;
-    // Use `whereFilterHash` to batch the same `findOrCreate` `where: { firstName: "a1" }` calls together to avoid duplicates
-    const whereValue = (0, findDataLoader_1.whereFilterHash)(
-    // Only maybeLower for the purposes of batching, not the later em.create
-    hasAnyCitext ? maybeLower(meta, where) : where);
-    const batchKey = `${type.name}-${whereValue}-${softDeletes}`;
-    const invalidKeys = Object.keys(where).filter((key) => {
-        const field = meta.allFields[key] ?? fail(`Invalid field ${key}`);
-        const supported = field.kind === "primitive" || field.kind === "enum" || field.kind === "m2o" || field.kind === "poly";
-        return !supported;
-    });
-    if (invalidKeys.length > 0) {
-        throw new Error("findOrCreate only supports primitive, enum, m2o, or poly fields in the where clause. Invalid keys: " +
-            invalidKeys.join(", "));
-    }
-    return em.getLoader("find-or-create", batchKey, async (keys) => {
-        // Because our `batchKey` is based only on the `where` clause, if the user called
-        // `findOrCreate({ firstName: a1 })` multiple times, but with different ifNew/upsert
-        // conditions (or different cased strings and is using a citext column), we'll end
-        // up with multiple keys...
-        //
-        // This is fundamentally asking to create the same entity, but with different ifNew/upsert
-        // conditions, which we could fail on, but for now just take the first tuple of
-        // {where/ifNew/upsert} and assume it wins
-        const [{ ifNew, upsert }] = keys;
-        // Before we find/create an entity, see if we have a maybe-new one in the EM already.
-        // This will also use any WIP changes we've made to the found entity, which ideally is
-        // something `em.find` would do as well, but its queries are much more complex...
-        const inMemory = em.filterEntities(type, where);
-        if (inMemory.length > 1) {
-            throw new EntityManager_1.TooManyError(`Found more than one existing ${type.name} with ${whereAsString(where)}`);
-        }
-        else if (inMemory.length === 1) {
-            const entity = inMemory[0];
-            (0, resurrection_1.resurrectIfSoftDeleted)(entity);
-            if (upsert) {
-                entity.set(upsert);
-            }
-            return keys.map(() => entity);
-        }
-        // If there is a param like `{ publisher: newPublisherEntity }`, then we know that
-        // an entity matching this condition can't be in the db anyway, so skip the em.find
-        const hasNewEntityParam = Object.values(where).some((v) => (0, Entity_1.isEntity)(v) && v.isNewEntity);
-        if (hasNewEntityParam) {
-            const entity = em.create(type, { ...where, ...ifNew });
-            if (upsert) {
-                entity.set(upsert);
-            }
-            return keys.map(() => entity);
-        }
-        // If we didn't find it in the EM, do the db query/em.create
-        const entities = await em.find(type, 
-        // Convert `publisher: undefined` --> `publisher: null`, and we need to make a copy anyway
-        Object.fromEntries(Object.entries(where).map(([k, v]) => [k, v === undefined ? null : v])), 
-        // Always include soft-deleted rows so findOrCreate can resurrect them instead of creating duplicates.
-        { softDeletes: "include" });
-        let entity;
-        if (entities.length > 1) {
-            throw new EntityManager_1.TooManyError(`Found more than one existing ${type.name} with ${whereAsString(where)}`);
-        }
-        else if (entities.length === 1) {
-            entity = entities[0];
-            (0, resurrection_1.resurrectIfSoftDeleted)(entity);
-        }
-        else {
-            entity = em.create(type, { ...where, ...ifNew });
-        }
-        if (upsert) {
-            entity.set(upsert);
-        }
-        return keys.map(() => entity);
-    }, 
-    // Our filter tuple is a complex object, so use a stable cache key to ensure caching works.
-    { cacheKeyFn: findDataLoader_1.whereFilterHash });
+	const meta = getMetadata(type);
+	const hasAnyStrings = Object.values(meta.allFields).some((f) => f.kind === "primitive" && f.type === "string");
+	const hasAnyCitext = Object.values(meta.allFields).some((f) => f.kind === "primitive" && f.citext);
+	where = hasAnyStrings ? maybeClean(meta, where) : where;
+	const whereValue = whereFilterHash(hasAnyCitext ? maybeLower(meta, where) : where);
+	const batchKey = `${type.name}-${whereValue}-${softDeletes}`;
+	const invalidKeys = Object.keys(where).filter((key) => {
+		const field = meta.allFields[key] ?? fail(`Invalid field ${key}`);
+		return !(field.kind === "primitive" || field.kind === "enum" || field.kind === "m2o" || field.kind === "poly");
+	});
+	if (invalidKeys.length > 0) throw new Error("findOrCreate only supports primitive, enum, m2o, or poly fields in the where clause. Invalid keys: " + invalidKeys.join(", "));
+	return em.getLoader("find-or-create", batchKey, async (keys) => {
+		const [{ ifNew, upsert }] = keys;
+		const inMemory = em.filterEntities(type, where);
+		if (inMemory.length > 1) throw new TooManyError(`Found more than one existing ${type.name} with ${whereAsString(where)}`);
+		else if (inMemory.length === 1) {
+			const entity = inMemory[0];
+			resurrectIfSoftDeleted(entity);
+			if (upsert) entity.set(upsert);
+			return keys.map(() => entity);
+		}
+		if (Object.values(where).some((v) => isEntity(v) && v.isNewEntity)) {
+			const entity = em.create(type, {
+				...where,
+				...ifNew
+			});
+			if (upsert) entity.set(upsert);
+			return keys.map(() => entity);
+		}
+		const entities = await em.find(type, Object.fromEntries(Object.entries(where).map(([k, v]) => [k, v === void 0 ? null : v])), { softDeletes: "include" });
+		let entity;
+		if (entities.length > 1) throw new TooManyError(`Found more than one existing ${type.name} with ${whereAsString(where)}`);
+		else if (entities.length === 1) {
+			entity = entities[0];
+			resurrectIfSoftDeleted(entity);
+		} else entity = em.create(type, {
+			...where,
+			...ifNew
+		});
+		if (upsert) entity.set(upsert);
+		return keys.map(() => entity);
+	}, { cacheKeyFn: whereFilterHash });
 }
 /** A simple in-memory match of `entity` against a mini/flat "WHERE clause" of `opts`. */
 function entityMatches(entity, opts) {
-    const meta = (0, EntityMetadata_1.getMetadata)(entity);
-    return Object.entries(opts).every(([fieldName, value]) => {
-        const field = meta.allFields[fieldName] ?? fail(`Invalid field ${fieldName}`);
-        const fn = fieldName;
-        switch (field.kind) {
-            case "primaryKey":
-            case "enum":
-                return entity[fn] === value;
-            case "primitive":
-                if (field.citext) {
-                    return compareCaseInsensitive(entity[fn], value);
-                }
-                else {
-                    return entity[fn] === value;
-                }
-            case "m2o":
-            case "poly":
-                const relation = entity[fn];
-                if ((0, relations_1.isLoadedReference)(relation)) {
-                    // Prefer using `.get` because it will handle new/id-less entities
-                    return (0, EntityManager_1.sameEntity)(relation.get, value);
-                }
-                else if (relation.isSet) {
-                    // Otherwise use ids
-                    return (0, EntityManager_1.sameEntity)(relation.id, value);
-                }
-                else {
-                    // Relation is not set, match if value is null-ish (null or undefined)
-                    return value === undefined || value === null;
-                }
-            default:
-                throw new Error(`Unsupported field ${fieldName}`);
-        }
-    });
+	const meta = getMetadata(entity);
+	return Object.entries(opts).every(([fieldName, value]) => {
+		const field = meta.allFields[fieldName] ?? fail(`Invalid field ${fieldName}`);
+		const fn = fieldName;
+		switch (field.kind) {
+			case "primaryKey":
+			case "enum": return entity[fn] === value;
+			case "primitive": if (field.citext) return compareCaseInsensitive(entity[fn], value);
+			else return entity[fn] === value;
+			case "m2o":
+			case "poly":
+				const relation = entity[fn];
+				if (isLoadedReference(relation)) return sameEntity(relation.get, value);
+				else if (relation.isSet) return sameEntity(relation.id, value);
+				else return value === void 0 || value === null;
+			default: throw new Error(`Unsupported field ${fieldName}`);
+		}
+	});
 }
 function whereAsString(where) {
-    return Object.entries(where)
-        .map(([key, value]) => `${key}=${value}`)
-        .join(", ");
+	return Object.entries(where).map(([key, value]) => `${key}=${value}`).join(", ");
 }
 function compareCaseInsensitive(str1, str2) {
-    return (str1 !== undefined &&
-        str2 !== undefined &&
-        typeof str1 === "string" &&
-        typeof str2 === "string" &&
-        str1.toLowerCase() === str2.toLowerCase());
+	return str1 !== void 0 && str2 !== void 0 && typeof str1 === "string" && typeof str2 === "string" && str1.toLowerCase() === str2.toLowerCase();
 }
 /** Returns a copy of `opts` with any `citext` values turned to lower case. */
 function maybeLower(meta, opts) {
-    if (!opts)
-        return opts;
-    let result = undefined;
-    for (const k in opts) {
-        const v = opts[k];
-        const field = meta.allFields[k];
-        const isString = field && field.kind === "primitive" && field.type === "string";
-        if (isString && field.citext) {
-            const lowered = v?.toLowerCase();
-            if (lowered !== v) {
-                result ??= { ...opts };
-                result[k] = lowered;
-            }
-        }
-    }
-    return result ?? opts;
+	if (!opts) return opts;
+	let result = void 0;
+	for (const k in opts) {
+		const v = opts[k];
+		const field = meta.allFields[k];
+		if (field && field.kind === "primitive" && field.type === "string" && field.citext) {
+			const lowered = v?.toLowerCase();
+			if (lowered !== v) {
+				result ??= { ...opts };
+				result[k] = lowered;
+			}
+		}
+	}
+	return result ?? opts;
 }
 /** Returns a copy of `opts` with any string values trimmed/coalesced. */
 function maybeClean(meta, opts) {
-    if (!opts)
-        return opts;
-    let result = undefined;
-    for (const k in opts) {
-        const v = opts[k];
-        const field = meta.allFields[k];
-        const isString = field && field.kind === "primitive" && field.type === "string";
-        if (isString && field.sanitize !== false) {
-            const cleaned = (0, utils_1.cleanStringValue)(v);
-            if (cleaned !== v) {
-                result ??= { ...opts }; // Only create copy on first change
-                result[k] = cleaned;
-            }
-        }
-    }
-    return result ?? opts;
+	if (!opts) return opts;
+	let result = void 0;
+	for (const k in opts) {
+		const v = opts[k];
+		const field = meta.allFields[k];
+		if (field && field.kind === "primitive" && field.type === "string" && field.sanitize !== false) {
+			const cleaned = cleanStringValue(v);
+			if (cleaned !== v) {
+				result ??= { ...opts };
+				result[k] = cleaned;
+			}
+		}
+	}
+	return result ?? opts;
 }
+//#endregion
+export { entityMatches, findOrCreateDataLoader };
+
 //# sourceMappingURL=findOrCreateDataLoader.js.map

package/build/dataloaders/findOrCreateDataLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"findOrCreateDataLoader.js","sourceRoot":"","sources":["../../src/dataloaders/findOrCreateDataLoader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"findOrCreateDataLoader.js","names":[],"sources":["../../src/dataloaders/findOrCreateDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport { whereFilterHash } from \"src/dataloaders/findDataLoader.ts\";\nimport { type Entity, isEntity } from \"src/Entity.ts\";\nimport { type EntityConstructor, type EntityManager, TooManyError, sameEntity } from \"src/EntityManager.ts\";\nimport { type EntityMetadata, getMetadata } from \"src/EntityMetadata.ts\";\nimport { type ManyToOneReference, type PolymorphicReference, isLoadedReference } from \"src/relations/index.ts\";\nimport { resurrectIfSoftDeleted } from \"src/resurrection.ts\";\nimport type { OptsOf } from \"src/typeMap.ts\";\nimport { cleanStringValue, fail } from \"src/utils.ts\";\n\ninterface FindOrCreateKey<T extends Entity> {\n  ifNew: OptsOf<T>;\n  upsert: Partial<OptsOf<T>> | undefined;\n}\n\nexport function findOrCreateDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: EntityConstructor<T>,\n  where: Partial<OptsOf<T>>,\n  softDeletes: \"include\" | \"exclude\",\n): DataLoader<FindOrCreateKey<T>, T> {\n  const meta = getMetadata(type);\n\n  // Do some extra logic to make unclean strings/citext not create duplicate entities\n  const hasAnyStrings = Object.values(meta.allFields).some((f) => f.kind === \"primitive\" && f.type === \"string\");\n  const hasAnyCitext = Object.values(meta.allFields).some((f) => f.kind === \"primitive\" && f.citext);\n\n  // The `where` here will be later used to `em.create`, so we only clean (not lower for citext)\n  where = hasAnyStrings ? maybeClean(meta, where) : where;\n  // Use `whereFilterHash` to batch the same `findOrCreate` `where: { firstName: \"a1\" }` calls together to avoid duplicates\n  const whereValue = whereFilterHash(\n    // Only maybeLower for the purposes of batching, not the later em.create\n    hasAnyCitext ? maybeLower(meta, where) : (where as any),\n  );\n  const batchKey = `${type.name}-${whereValue}-${softDeletes}`;\n\n  const invalidKeys = Object.keys(where).filter((key) => {\n    const field = meta.allFields[key] ?? fail(`Invalid field ${key}`);\n    const supported =\n      field.kind === \"primitive\" || field.kind === \"enum\" || field.kind === \"m2o\" || field.kind === \"poly\";\n    return !supported;\n  });\n  if (invalidKeys.length > 0) {\n    throw new Error(\n      \"findOrCreate only supports primitive, enum, m2o, or poly fields in the where clause. Invalid keys: \" +\n        invalidKeys.join(\", \"),\n    );\n  }\n\n  return em.getLoader<FindOrCreateKey<T>, T>(\n    \"find-or-create\",\n    batchKey,\n    async (keys) => {\n      // Because our `batchKey` is based only on the `where` clause, if the user called\n      // `findOrCreate({ firstName: a1 })` multiple times, but with different ifNew/upsert\n      // conditions (or different cased strings and is using a citext column), we'll end\n      // up with multiple keys...\n      //\n      // This is fundamentally asking to create the same entity, but with different ifNew/upsert\n      // conditions, which we could fail on, but for now just take the first tuple of\n      // {where/ifNew/upsert} and assume it wins\n      const [{ ifNew, upsert }] = keys;\n\n      // Before we find/create an entity, see if we have a maybe-new one in the EM already.\n      // This will also use any WIP changes we've made to the found entity, which ideally is\n      // something `em.find` would do as well, but its queries are much more complex...\n      const inMemory = em.filterEntities(type, where);\n      if (inMemory.length > 1) {\n        throw new TooManyError(`Found more than one existing ${type.name} with ${whereAsString(where)}`);\n      } else if (inMemory.length === 1) {\n        const entity = inMemory[0] as T;\n        resurrectIfSoftDeleted(entity);\n        if (upsert) {\n          entity.set(upsert);\n        }\n        return keys.map(() => entity);\n      }\n\n      // If there is a param like `{ publisher: newPublisherEntity }`, then we know that\n      // an entity matching this condition can't be in the db anyway, so skip the em.find\n      const hasNewEntityParam = Object.values(where).some((v) => isEntity(v) && v.isNewEntity);\n      if (hasNewEntityParam) {\n        const entity = em.create(type, { ...where, ...(ifNew as object) } as OptsOf<T>);\n        if (upsert) {\n          entity.set(upsert);\n        }\n        return keys.map(() => entity);\n      }\n\n      // If we didn't find it in the EM, do the db query/em.create\n      const entities = await em.find(\n        type,\n        // Convert `publisher: undefined` --> `publisher: null`, and we need to make a copy anyway\n        Object.fromEntries(Object.entries(where).map(([k, v]) => [k, v === undefined ? null : v])) as any,\n        // Always include soft-deleted rows so findOrCreate can resurrect them instead of creating duplicates.\n        { softDeletes: \"include\" },\n      );\n      let entity: T;\n      if (entities.length > 1) {\n        throw new TooManyError(`Found more than one existing ${type.name} with ${whereAsString(where)}`);\n      } else if (entities.length === 1) {\n        entity = entities[0];\n        resurrectIfSoftDeleted(entity);\n      } else {\n        entity = em.create(type, { ...where, ...(ifNew as object) } as OptsOf<T>);\n      }\n      if (upsert) {\n        entity.set(upsert);\n      }\n      return keys.map(() => entity);\n    },\n    // Our filter tuple is a complex object, so use a stable cache key to ensure caching works.\n    { cacheKeyFn: whereFilterHash as any },\n  );\n}\n\n/** A simple in-memory match of `entity` against a mini/flat \"WHERE clause\" of `opts`. */\nexport function entityMatches<T extends Entity>(entity: T, opts: Partial<OptsOf<T>>): boolean {\n  const meta = getMetadata(entity);\n  return Object.entries(opts).every(([fieldName, value]) => {\n    const field = meta.allFields[fieldName] ?? fail(`Invalid field ${fieldName}`);\n    const fn = fieldName as keyof T & keyof OptsOf<T>;\n    switch (field.kind) {\n      case \"primaryKey\":\n      case \"enum\":\n        return entity[fn] === value;\n      case \"primitive\":\n        if (field.citext) {\n          return compareCaseInsensitive(entity[fn], value);\n        } else {\n          return entity[fn] === value;\n        }\n      case \"m2o\":\n      case \"poly\":\n        const relation = entity[fn] as ManyToOneReference<T, any, any> | PolymorphicReference<T, any, any>;\n        if (isLoadedReference(relation)) {\n          // Prefer using `.get` because it will handle new/id-less entities\n          return sameEntity(relation.get, value as any);\n        } else if (relation.isSet) {\n          // Otherwise use ids\n          return sameEntity(relation.id as any, value as any);\n        } else {\n          // Relation is not set, match if value is null-ish (null or undefined)\n          return value === undefined || value === null;\n        }\n      default:\n        throw new Error(`Unsupported field ${fieldName}`);\n    }\n  });\n}\n\nfunction whereAsString(where: object): string {\n  return Object.entries(where)\n    .map(([key, value]) => `${key}=${value}`)\n    .join(\", \");\n}\n\nfunction compareCaseInsensitive(str1: any, str2: any): boolean {\n  return (\n    str1 !== undefined &&\n    str2 !== undefined &&\n    typeof str1 === \"string\" &&\n    typeof str2 === \"string\" &&\n    str1.toLowerCase() === str2.toLowerCase()\n  );\n}\n\n/** Returns a copy of `opts` with any `citext` values turned to lower case. */\nfunction maybeLower<T extends object | undefined>(meta: EntityMetadata, opts: T): T {\n  if (!opts) return opts;\n  let result: T | undefined = undefined;\n  for (const k in opts) {\n    const v = (opts as any)[k];\n    const field = meta.allFields[k];\n    const isString = field && field.kind === \"primitive\" && field.type === \"string\";\n    if (isString && field.citext) {\n      const lowered = v?.toLowerCase();\n      if (lowered !== v) {\n        result ??= { ...opts };\n        (result as any)[k] = lowered as any;\n      }\n    }\n  }\n  return result ?? opts;\n}\n\n/** Returns a copy of `opts` with any string values trimmed/coalesced. */\nfunction maybeClean<T extends object | undefined>(meta: EntityMetadata, opts: T): T {\n  if (!opts) return opts;\n  let result: T | undefined = undefined;\n  for (const k in opts) {\n    const v = (opts as any)[k];\n    const field = meta.allFields[k];\n    const isString = field && field.kind === \"primitive\" && field.type === \"string\";\n    if (isString && field.sanitize !== false) {\n      const cleaned = cleanStringValue(v);\n      if (cleaned !== v) {\n        result ??= { ...opts }; // Only create copy on first change\n        (result as any)[k] = cleaned;\n      }\n    }\n  }\n  return result ?? opts;\n}\n"],"mappings":"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"}

package/build/dataloaders/findPaginatedDataLoader.cjs

@@ -0,0 +1,98 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_normalizeHints = require("../normalizeHints.cjs");
+const require_queries_find_QueryVisitor = require("../queries/find/QueryVisitor.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
+const require_EntityMetadata = require("../EntityMetadata.cjs");
+const require_loading_HintTree = require("../loading/HintTree.cjs");
+const require_queries_unnest = require("../queries/unnest.cjs");
+const require_dataloaders_findDataLoader = require("./findDataLoader.cjs");
+const require_EntityManager = require("../EntityManager.cjs");
+//#region src/dataloaders/findPaginatedDataLoader.ts
+/** Returns a dataloader that batches paginated finds by applying pagination inside each lateral subquery. */
+function findPaginatedDataLoader(em, type, filter, hint) {
+	const { where, limit, offset, ...opts } = filter;
+	const meta = require_EntityMetadata.getMetadata(type);
+	const query = require_queries_find_QueryParser.parseFindQuery(meta, where, opts);
+	const { findSettings } = em["prepareFind"](meta, require_dataloaders_findDataLoader.findOperation, query, {
+		...opts,
+		limit,
+		offset,
+		checkLimit: false
+	});
+	if (require_queries_find_QueryVisitor.isQueryProvablyEmpty(query)) return Promise.resolve([]);
+	const bindings = [];
+	require_dataloaders_findDataLoader.collectValues(bindings, query);
+	const prepared = {
+		filter,
+		query,
+		bindings,
+		findSettings,
+		limit: findSettings.limit,
+		offset: findSettings.offset
+	};
+	const batchKey = [
+		require_dataloaders_findDataLoader.getBatchKeyFromGenericStructure(meta, query),
+		require_normalizeHints.hintKey(hint),
+		findSettings.limit,
+		findSettings.offset
+	].join("-");
+	return em.getLoader(require_dataloaders_findDataLoader.findOperation, batchKey, async (entries) => {
+		if (entries.length === 1) {
+			const { query, findSettings } = entries[0];
+			const { preloader } = require_EntityManager.getEmInternalApi(em);
+			const preloadHydrator = preloader && hint && preloader.addPreloading(meta, require_loading_HintTree.buildHintTree(hint), query);
+			const rows = await em["executePreparedFind"](meta, require_dataloaders_findDataLoader.findOperation, query, findSettings, false);
+			const entities = em.hydrate(type, rows);
+			preloadHydrator?.(rows, entities);
+			return [require_dataloaders_findDataLoader.filterDeletedEntities(em, entities)];
+		}
+		const { query, findSettings, limit, offset } = entries[0];
+		const { preloader } = require_EntityManager.getEmInternalApi(em);
+		const preloadHydrator = preloader && hint && preloader.addPreloading(meta, require_loading_HintTree.buildHintTree(hint), query);
+		const args = require_dataloaders_findDataLoader.collectAndReplaceArgs(query, entries);
+		const argsColumns = [{
+			columnName: "tag",
+			dbType: "int"
+		}, ...args.map((a) => a.column)];
+		const columnValues = require_dataloaders_findDataLoader.createColumnValuesFromPrepared(args, entries);
+		const query2 = {
+			selects: ["_find.tag as tag", "_data.*"],
+			tables: [{
+				join: "primary",
+				table: "_find",
+				alias: "_find"
+			}, {
+				join: "lateral",
+				query,
+				table: meta.tableName,
+				alias: "_data",
+				fromAlias: "_find",
+				settings: {
+					limit,
+					offset
+				}
+			}],
+			ctes: [require_queries_unnest.buildUnnestCte("_find", argsColumns, columnValues)],
+			orderBys: []
+		};
+		const rows = await em["executePreparedFind"](meta, require_dataloaders_findDataLoader.findOperation, query2, {
+			...findSettings,
+			limit: void 0,
+			offset: void 0
+		}, false);
+		const entities = em.hydrate(type, rows);
+		preloadHydrator?.(rows, entities);
+		const results = entries.map(() => []);
+		for (let i = 0; i < rows.length; i++) {
+			const row = rows[i];
+			const entity = entities[i];
+			if (!entity.isDeletedEntity) results[row.tag].push(entity);
+			delete row.tag;
+		}
+		return results;
+	}, { cacheKeyFn: require_dataloaders_findDataLoader.queryFilterHash }).load(prepared);
+}
+//#endregion
+exports.findPaginatedDataLoader = findPaginatedDataLoader;
+
+//# sourceMappingURL=findPaginatedDataLoader.cjs.map

package/build/dataloaders/findPaginatedDataLoader.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"findPaginatedDataLoader.cjs","names":["getMetadata","parseFindQuery","findOperation","isQueryProvablyEmpty","getBatchKeyFromGenericStructure","hintKey","getEmInternalApi","buildHintTree","filterDeletedEntities","collectAndReplaceArgs","createColumnValuesFromPrepared","buildUnnestCte","queryFilterHash"],"sources":["../../src/dataloaders/findPaginatedDataLoader.ts"],"sourcesContent":["import {\n  collectAndReplaceArgs,\n  collectValues,\n  createColumnValuesFromPrepared,\n  filterDeletedEntities,\n  findOperation,\n  getBatchKeyFromGenericStructure,\n  queryFilterHash,\n} from \"src/dataloaders/findDataLoader.ts\";\nimport type { Entity } from \"src/Entity.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor, getEmInternalApi } from \"src/EntityManager.ts\";\nimport { getMetadata } from \"src/EntityMetadata.ts\";\nimport { buildHintTree } from \"src/loading/HintTree.ts\";\nimport type { LoadHint } from \"src/loading/loadHints.ts\";\nimport { hintKey } from \"src/normalizeHints.ts\";\nimport type { FilterAndSettings } from \"src/queries/find/EntityFilter.ts\";\nimport { type ParsedFindQuery, parseFindQuery } from \"src/queries/find/QueryParser.ts\";\nimport { isQueryProvablyEmpty } from \"src/queries/find/QueryVisitor.ts\";\nimport { buildUnnestCte } from \"src/queries/unnest.ts\";\n\ninterface PreparedPaginatedFindEntry<T extends Entity> {\n  filter: FilterAndSettings<T>;\n  query: ParsedFindQuery;\n  bindings: any[];\n  findSettings: any;\n  limit: number | undefined;\n  offset: number | undefined;\n}\n\n/** Returns a dataloader that batches paginated finds by applying pagination inside each lateral subquery. */\nexport function findPaginatedDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  filter: FilterAndSettings<T>,\n  hint: LoadHint<T> | undefined,\n): Promise<T[]> {\n  const { where, limit, offset, ...opts } = filter;\n  const meta = getMetadata(type);\n  const query = parseFindQuery(meta, where, opts);\n  const { findSettings } = em[\"prepareFind\"](meta, findOperation, query, { ...opts, limit, offset, checkLimit: false });\n  if (isQueryProvablyEmpty(query)) return Promise.resolve([]);\n\n  const bindings: any[] = [];\n  collectValues(bindings, query);\n  const prepared = {\n    filter,\n    query,\n    bindings,\n    findSettings,\n    limit: findSettings.limit,\n    offset: findSettings.offset,\n  };\n  const batchKey = [\n    getBatchKeyFromGenericStructure(meta, query),\n    hintKey(hint),\n    findSettings.limit,\n    findSettings.offset,\n  ].join(\"-\");\n\n  return em\n    .getLoader<PreparedPaginatedFindEntry<T>, T[]>(\n      findOperation,\n      batchKey,\n      async (entries) => {\n        if (entries.length === 1) {\n          // Skip batching & just execute the query as-is\n          const { query, findSettings } = entries[0];\n          const { preloader } = getEmInternalApi(em);\n          const preloadHydrator = preloader && hint && preloader.addPreloading(meta, buildHintTree(hint), query);\n          const rows = await em[\"executePreparedFind\"](meta, findOperation, query, findSettings, false);\n          const entities = em.hydrate(type, rows);\n          preloadHydrator?.(rows, entities);\n          return [filterDeletedEntities(em, entities)];\n        }\n\n        const { query, findSettings, limit, offset } = entries[0];\n        const { preloader } = getEmInternalApi(em);\n        const preloadHydrator = preloader && hint && preloader.addPreloading(meta, buildHintTree(hint), query);\n\n        // Now craft the actual batched query\n        const args = collectAndReplaceArgs(query, entries);\n        const argsColumns = [{ columnName: \"tag\", dbType: \"int\" }, ...args.map((a) => a.column)];\n        const columnValues = createColumnValuesFromPrepared(args, entries);\n        const query2: ParsedFindQuery = {\n          selects: [\"_find.tag as tag\", \"_data.*\"],\n          tables: [\n            { join: \"primary\", table: \"_find\", alias: \"_find\" },\n            {\n              join: \"lateral\",\n              query,\n              table: meta.tableName,\n              alias: \"_data\",\n              fromAlias: \"_find\",\n              settings: { limit, offset },\n            },\n          ],\n          ctes: [buildUnnestCte(\"_find\", argsColumns, columnValues)],\n          orderBys: [],\n        };\n\n        const rows = await em[\"executePreparedFind\"](\n          meta,\n          findOperation,\n          query2,\n          { ...findSettings, limit: undefined, offset: undefined },\n          false,\n        );\n        const entities = em.hydrate(type, rows);\n        preloadHydrator?.(rows, entities);\n\n        const results = entries.map(() => [] as T[]);\n        for (let i = 0; i < rows.length; i++) {\n          const row = rows[i];\n          const entity = entities[i];\n          if (!entity.isDeletedEntity) {\n            results[row.tag].push(entity);\n          }\n          delete row.tag;\n        }\n        return results;\n      },\n      { cacheKeyFn: queryFilterHash },\n    )\n    .load(prepared);\n}\n"],"mappings":";;;;;;;;;;;AA8BA,SAAgB,wBACd,IACA,MACA,QACA,MACc;CACd,MAAM,EAAE,OAAO,OAAO,QAAQ,GAAG,SAAS;CAC1C,MAAM,OAAOA,uBAAAA,YAAY,IAAI;CAC7B,MAAM,QAAQC,iCAAAA,eAAe,MAAM,OAAO,IAAI;CAC9C,MAAM,EAAE,iBAAiB,GAAG,cAAc,CAAC,MAAMC,mCAAAA,eAAe,OAAO;EAAE,GAAG;EAAM;EAAO;EAAQ,YAAY;CAAM,CAAC;CACpH,IAAIC,kCAAAA,qBAAqB,KAAK,GAAG,OAAO,QAAQ,QAAQ,CAAC,CAAC;CAE1D,MAAM,WAAkB,CAAC;CACzB,mCAAA,cAAc,UAAU,KAAK;CAC7B,MAAM,WAAW;EACf;EACA;EACA;EACA;EACA,OAAO,aAAa;EACpB,QAAQ,aAAa;CACvB;CACA,MAAM,WAAW;EACfC,mCAAAA,gCAAgC,MAAM,KAAK;EAC3CC,uBAAAA,QAAQ,IAAI;EACZ,aAAa;EACb,aAAa;CACf,CAAC,CAAC,KAAK,GAAG;CAEV,OAAO,GACJ,UACCH,mCAAAA,eACA,UACA,OAAO,YAAY;EACjB,IAAI,QAAQ,WAAW,GAAG;GAExB,MAAM,EAAE,OAAO,iBAAiB,QAAQ;GACxC,MAAM,EAAE,cAAcI,sBAAAA,iBAAiB,EAAE;GACzC,MAAM,kBAAkB,aAAa,QAAQ,UAAU,cAAc,MAAMC,yBAAAA,cAAc,IAAI,GAAG,KAAK;GACrG,MAAM,OAAO,MAAM,GAAG,sBAAsB,CAAC,MAAML,mCAAAA,eAAe,OAAO,cAAc,KAAK;GAC5F,MAAM,WAAW,GAAG,QAAQ,MAAM,IAAI;GACtC,kBAAkB,MAAM,QAAQ;GAChC,OAAO,CAACM,mCAAAA,sBAAsB,IAAI,QAAQ,CAAC;EAC7C;EAEA,MAAM,EAAE,OAAO,cAAc,OAAO,WAAW,QAAQ;EACvD,MAAM,EAAE,cAAcF,sBAAAA,iBAAiB,EAAE;EACzC,MAAM,kBAAkB,aAAa,QAAQ,UAAU,cAAc,MAAMC,yBAAAA,cAAc,IAAI,GAAG,KAAK;EAGrG,MAAM,OAAOE,mCAAAA,sBAAsB,OAAO,OAAO;EACjD,MAAM,cAAc,CAAC;GAAE,YAAY;GAAO,QAAQ;EAAM,GAAG,GAAG,KAAK,KAAK,MAAM,EAAE,MAAM,CAAC;EACvF,MAAM,eAAeC,mCAAAA,+BAA+B,MAAM,OAAO;EACjE,MAAM,SAA0B;GAC9B,SAAS,CAAC,oBAAoB,SAAS;GACvC,QAAQ,CACN;IAAE,MAAM;IAAW,OAAO;IAAS,OAAO;GAAQ,GAClD;IACE,MAAM;IACN;IACA,OAAO,KAAK;IACZ,OAAO;IACP,WAAW;IACX,UAAU;KAAE;KAAO;IAAO;GAC5B,CACF;GACA,MAAM,CAACC,uBAAAA,eAAe,SAAS,aAAa,YAAY,CAAC;GACzD,UAAU,CAAC;EACb;EAEA,MAAM,OAAO,MAAM,GAAG,sBAAsB,CAC1C,MACAT,mCAAAA,eACA,QACA;GAAE,GAAG;GAAc,OAAO,KAAA;GAAW,QAAQ,KAAA;EAAU,GACvD,KACF;EACA,MAAM,WAAW,GAAG,QAAQ,MAAM,IAAI;EACtC,kBAAkB,MAAM,QAAQ;EAEhC,MAAM,UAAU,QAAQ,UAAU,CAAC,CAAQ;EAC3C,KAAK,IAAI,IAAI,GAAG,IAAI,KAAK,QAAQ,KAAK;GACpC,MAAM,MAAM,KAAK;GACjB,MAAM,SAAS,SAAS;GACxB,IAAI,CAAC,OAAO,iBACV,QAAQ,IAAI,IAAI,CAAC,KAAK,MAAM;GAE9B,OAAO,IAAI;EACb;EACA,OAAO;CACT,GACA,EAAE,YAAYU,mCAAAA,gBAAgB,CAChC,CAAC,CACA,KAAK,QAAQ;AAClB"}

package/build/dataloaders/findPaginatedDataLoader.d.cts

@@ -0,0 +1,10 @@
+import { FilterAndSettings } from "../queries/find/EntityFilter.cjs";
+import { LoadHint } from "../loading/loadHints.cjs";
+import { EntityManager, MaybeAbstractEntityConstructor } from "../EntityManager.cjs";
+import { Entity } from "../Entity.cjs";
+//#region src/dataloaders/findPaginatedDataLoader.d.ts
+/** Returns a dataloader that batches paginated finds by applying pagination inside each lateral subquery. */
+declare function findPaginatedDataLoader<T extends Entity>(em: EntityManager, type: MaybeAbstractEntityConstructor<T>, filter: FilterAndSettings<T>, hint: LoadHint<T> | undefined): Promise<T[]>;
+//#endregion
+export { findPaginatedDataLoader };
+//# sourceMappingURL=findPaginatedDataLoader.d.cts.map

package/build/dataloaders/findPaginatedDataLoader.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findPaginatedDataLoader.d.cts","names":[],"sources":["../../src/dataloaders/findPaginatedDataLoader.ts"],"mappings":";;;;;;iBA8BgB,wBAAwB,UAAU,QAChD,IAAI,eACJ,MAAM,+BAA+B,IACrC,QAAQ,kBAAkB,IAC1B,MAAM,SAAS,iBACd,QAAQ"}

package/build/dataloaders/findPaginatedDataLoader.d.mts

@@ -0,0 +1,10 @@
+import { FilterAndSettings } from "../queries/find/EntityFilter.mjs";
+import { LoadHint } from "../loading/loadHints.mjs";
+import { EntityManager, MaybeAbstractEntityConstructor } from "../EntityManager.mjs";
+import { Entity } from "../Entity.mjs";
+//#region src/dataloaders/findPaginatedDataLoader.d.ts
+/** Returns a dataloader that batches paginated finds by applying pagination inside each lateral subquery. */
+declare function findPaginatedDataLoader<T extends Entity>(em: EntityManager, type: MaybeAbstractEntityConstructor<T>, filter: FilterAndSettings<T>, hint: LoadHint<T> | undefined): Promise<T[]>;
+//#endregion
+export { findPaginatedDataLoader };
+//# sourceMappingURL=findPaginatedDataLoader.d.mts.map

package/build/dataloaders/findPaginatedDataLoader.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findPaginatedDataLoader.d.mts","names":[],"sources":["../../src/dataloaders/findPaginatedDataLoader.ts"],"mappings":";;;;;;iBA8BgB,wBAAwB,UAAU,QAChD,IAAI,eACJ,MAAM,+BAA+B,IACrC,QAAQ,kBAAkB,IAC1B,MAAM,SAAS,iBACd,QAAQ"}