joist-core 2.3.0-next.95 → 2.3.0-next.97

package/build/dataloaders/findOrCreateDataLoader.js

@@ -1,8 +1,7 @@
-import "../typeMap.js";
 import { isLoadedReference } from "../relations/Reference.js";
+import { cleanStringValue, fail } from "../utils.js";
 import "../relations/index.js";
 import { getMetadata } from "../EntityMetadata.js";
-import { cleanStringValue, fail } from "../utils.js";
 import { whereFilterHash } from "./findDataLoader.js";
 import { resurrectIfSoftDeleted } from "../resurrection.js";
 import { TooManyError, sameEntity } from "../EntityManager.js";

package/build/dataloaders/findOrCreateDataLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"findOrCreateDataLoader.js","names":[],"sources":["../../src/dataloaders/findOrCreateDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Entity, isEntity } from \"../Entity.ts\";\nimport { type EntityConstructor, type EntityManager, TooManyError, sameEntity } from \"../EntityManager.ts\";\nimport { type EntityMetadata, getMetadata } from \"../EntityMetadata.ts\";\nimport { type ManyToOneReference, type PolymorphicReference, isLoadedReference } from \"../relations/index.ts\";\nimport { resurrectIfSoftDeleted } from \"../resurrection.ts\";\nimport { type OptsOf } from \"../typeMap.ts\";\nimport { cleanStringValue, fail } from \"../utils.ts\";\nimport { whereFilterHash } from \"./findDataLoader.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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"}
+{"version":3,"file":"findOrCreateDataLoader.js","names":[],"sources":["../../src/dataloaders/findOrCreateDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Entity, isEntity } from \"../Entity.ts\";\nimport { type EntityConstructor, type EntityManager, TooManyError, sameEntity } from \"../EntityManager.ts\";\nimport { type EntityMetadata, getMetadata } from \"../EntityMetadata.ts\";\nimport { type ManyToOneReference, type PolymorphicReference, isLoadedReference } from \"../relations/index.ts\";\nimport { resurrectIfSoftDeleted } from \"../resurrection.ts\";\nimport type { OptsOf } from \"../typeMap.ts\";\nimport { cleanStringValue, fail } from \"../utils.ts\";\nimport { whereFilterHash } from \"./findDataLoader.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

@@ -1,20 +1,17 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../EntityFilter.cjs");
-const require_EntityMetadata = require("../EntityMetadata.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
 const require_normalizeHints = require("../normalizeHints.cjs");
-require("../loadHints.cjs");
+const require_EntityMetadata = require("../EntityMetadata.cjs");
 const require_HintTree = require("../HintTree.cjs");
 const require_unnest = require("../unnest.cjs");
 const require_dataloaders_findDataLoader = require("./findDataLoader.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
-require("../Entity.cjs");
-const require_QueryParser = require("../QueryParser.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_QueryParser.parseFindQuery(meta, where, opts);
+	const query = require_queries_find_QueryParser.parseFindQuery(meta, where, opts);
 	const { findSettings } = em["prepareFind"](meta, require_dataloaders_findDataLoader.findOperation, query, {
 		...opts,
 		limit,

package/build/dataloaders/findPaginatedDataLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"findPaginatedDataLoader.cjs","names":["getMetadata","parseFindQuery","findOperation","getBatchKeyFromGenericStructure","hintKey","getEmInternalApi","buildHintTree","filterDeletedEntities","collectAndReplaceArgs","createColumnValuesFromPrepared","buildUnnestCte","queryFilterHash"],"sources":["../../src/dataloaders/findPaginatedDataLoader.ts"],"sourcesContent":["import { type Entity } from \"../Entity.ts\";\nimport { type FilterAndSettings } from \"../EntityFilter.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor, getEmInternalApi } from \"../EntityManager.ts\";\nimport { getMetadata } from \"../EntityMetadata.ts\";\nimport { buildHintTree } from \"../HintTree.ts\";\nimport { type LoadHint } from \"../loadHints.ts\";\nimport { hintKey } from \"../normalizeHints.ts\";\nimport { type ParsedFindQuery, parseFindQuery } from \"../QueryParser.ts\";\nimport { buildUnnestCte } from \"../unnest.ts\";\nimport {\n  collectAndReplaceArgs,\n  collectValues,\n  createColumnValuesFromPrepared,\n  filterDeletedEntities,\n  findOperation,\n  getBatchKeyFromGenericStructure,\n  queryFilterHash,\n} from \"./findDataLoader.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  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":";;;;;;;;;;;;;AA6BA,SAAgB,wBACd,IACA,MACA,QACA,MACc;CACd,MAAM,EAAE,OAAO,OAAO,QAAQ,GAAG,SAAS;CAC1C,MAAM,OAAOA,uBAAAA,YAAY,IAAI;CAC7B,MAAM,QAAQC,oBAAAA,eAAe,MAAM,OAAO,IAAI;CAC9C,MAAM,EAAE,iBAAiB,GAAG,cAAc,CAAC,MAAMC,mCAAAA,eAAe,OAAO;EAAE,GAAG;EAAM;EAAO;EAAQ,YAAY;CAAM,CAAC;CACpH,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,UACCF,mCAAAA,eACA,UACA,OAAO,YAAY;EACjB,IAAI,QAAQ,WAAW,GAAG;GAExB,MAAM,EAAE,OAAO,iBAAiB,QAAQ;GACxC,MAAM,EAAE,cAAcG,sBAAAA,iBAAiB,EAAE;GACzC,MAAM,kBAAkB,aAAa,QAAQ,UAAU,cAAc,MAAMC,iBAAAA,cAAc,IAAI,GAAG,KAAK;GACrG,MAAM,OAAO,MAAM,GAAG,sBAAsB,CAAC,MAAMJ,mCAAAA,eAAe,OAAO,cAAc,KAAK;GAC5F,MAAM,WAAW,GAAG,QAAQ,MAAM,IAAI;GACtC,kBAAkB,MAAM,QAAQ;GAChC,OAAO,CAACK,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,iBAAAA,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,eAAAA,eAAe,SAAS,aAAa,YAAY,CAAC;GACzD,UAAU,CAAC;EACb;EAEA,MAAM,OAAO,MAAM,GAAG,sBAAsB,CAC1C,MACAR,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,YAAYS,mCAAAA,gBAAgB,CAChC,CAAC,CACA,KAAK,QAAQ;AAClB"}
+{"version":3,"file":"findPaginatedDataLoader.cjs","names":["getMetadata","parseFindQuery","findOperation","getBatchKeyFromGenericStructure","hintKey","getEmInternalApi","buildHintTree","filterDeletedEntities","collectAndReplaceArgs","createColumnValuesFromPrepared","buildUnnestCte","queryFilterHash"],"sources":["../../src/dataloaders/findPaginatedDataLoader.ts"],"sourcesContent":["import type { Entity } from \"../Entity.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor, getEmInternalApi } from \"../EntityManager.ts\";\nimport { getMetadata } from \"../EntityMetadata.ts\";\nimport { buildHintTree } from \"../HintTree.ts\";\nimport type { LoadHint } from \"../loadHints.ts\";\nimport { hintKey } from \"../normalizeHints.ts\";\nimport type { FilterAndSettings } from \"../queries/find/EntityFilter.ts\";\nimport { type ParsedFindQuery, parseFindQuery } from \"../queries/find/QueryParser.ts\";\nimport { buildUnnestCte } from \"../unnest.ts\";\nimport {\n  collectAndReplaceArgs,\n  collectValues,\n  createColumnValuesFromPrepared,\n  filterDeletedEntities,\n  findOperation,\n  getBatchKeyFromGenericStructure,\n  queryFilterHash,\n} from \"./findDataLoader.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  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":";;;;;;;;;;AA6BA,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,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,UACCF,mCAAAA,eACA,UACA,OAAO,YAAY;EACjB,IAAI,QAAQ,WAAW,GAAG;GAExB,MAAM,EAAE,OAAO,iBAAiB,QAAQ;GACxC,MAAM,EAAE,cAAcG,sBAAAA,iBAAiB,EAAE;GACzC,MAAM,kBAAkB,aAAa,QAAQ,UAAU,cAAc,MAAMC,iBAAAA,cAAc,IAAI,GAAG,KAAK;GACrG,MAAM,OAAO,MAAM,GAAG,sBAAsB,CAAC,MAAMJ,mCAAAA,eAAe,OAAO,cAAc,KAAK;GAC5F,MAAM,WAAW,GAAG,QAAQ,MAAM,IAAI;GACtC,kBAAkB,MAAM,QAAQ;GAChC,OAAO,CAACK,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,iBAAAA,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,eAAAA,eAAe,SAAS,aAAa,YAAY,CAAC;GACzD,UAAU,CAAC;EACb;EAEA,MAAM,OAAO,MAAM,GAAG,sBAAsB,CAC1C,MACAR,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,YAAYS,mCAAAA,gBAAgB,CAChC,CAAC,CACA,KAAK,QAAQ;AAClB"}

package/build/dataloaders/findPaginatedDataLoader.d.cts

@@ -1,7 +1,7 @@
+import { FilterAndSettings } from "../queries/find/EntityFilter.cjs";
 import { LoadHint } from "../loadHints.cjs";
 import { EntityManager, MaybeAbstractEntityConstructor } from "../EntityManager.cjs";
 import { Entity } from "../Entity.cjs";
-import { FilterAndSettings } from "../EntityFilter.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[]>;

package/build/dataloaders/findPaginatedDataLoader.d.mts

@@ -1,7 +1,7 @@
+import { FilterAndSettings } from "../queries/find/EntityFilter.mjs";
 import { LoadHint } from "../loadHints.mjs";
 import { EntityManager, MaybeAbstractEntityConstructor } from "../EntityManager.mjs";
 import { Entity } from "../Entity.mjs";
-import { FilterAndSettings } from "../EntityFilter.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[]>;

package/build/dataloaders/findPaginatedDataLoader.js

@@ -1,13 +1,10 @@
-import "../EntityFilter.js";
-import { getMetadata } from "../EntityMetadata.js";
+import { parseFindQuery } from "../queries/find/QueryParser.js";
 import { hintKey } from "../normalizeHints.js";
-import "../loadHints.js";
+import { getMetadata } from "../EntityMetadata.js";
 import { buildHintTree } from "../HintTree.js";
 import { buildUnnestCte } from "../unnest.js";
 import { collectAndReplaceArgs, collectValues, createColumnValuesFromPrepared, filterDeletedEntities, findOperation, getBatchKeyFromGenericStructure, queryFilterHash } from "./findDataLoader.js";
 import { getEmInternalApi } from "../EntityManager.js";
-import "../Entity.js";
-import { parseFindQuery } from "../QueryParser.js";
 //#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) {

package/build/dataloaders/findPaginatedDataLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"findPaginatedDataLoader.js","names":[],"sources":["../../src/dataloaders/findPaginatedDataLoader.ts"],"sourcesContent":["import { type Entity } from \"../Entity.ts\";\nimport { type FilterAndSettings } from \"../EntityFilter.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor, getEmInternalApi } from \"../EntityManager.ts\";\nimport { getMetadata } from \"../EntityMetadata.ts\";\nimport { buildHintTree } from \"../HintTree.ts\";\nimport { type LoadHint } from \"../loadHints.ts\";\nimport { hintKey } from \"../normalizeHints.ts\";\nimport { type ParsedFindQuery, parseFindQuery } from \"../QueryParser.ts\";\nimport { buildUnnestCte } from \"../unnest.ts\";\nimport {\n  collectAndReplaceArgs,\n  collectValues,\n  createColumnValuesFromPrepared,\n  filterDeletedEntities,\n  findOperation,\n  getBatchKeyFromGenericStructure,\n  queryFilterHash,\n} from \"./findDataLoader.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  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":";;;;;;;;;;;;AA6BA,SAAgB,wBACd,IACA,MACA,QACA,MACc;CACd,MAAM,EAAE,OAAO,OAAO,QAAQ,GAAG,SAAS;CAC1C,MAAM,OAAO,YAAY,IAAI;CAC7B,MAAM,QAAQ,eAAe,MAAM,OAAO,IAAI;CAC9C,MAAM,EAAE,iBAAiB,GAAG,cAAc,CAAC,MAAM,eAAe,OAAO;EAAE,GAAG;EAAM;EAAO;EAAQ,YAAY;CAAM,CAAC;CACpH,MAAM,WAAkB,CAAC;CACzB,cAAc,UAAU,KAAK;CAC7B,MAAM,WAAW;EACf;EACA;EACA;EACA;EACA,OAAO,aAAa;EACpB,QAAQ,aAAa;CACvB;CACA,MAAM,WAAW;EACf,gCAAgC,MAAM,KAAK;EAC3C,QAAQ,IAAI;EACZ,aAAa;EACb,aAAa;CACf,CAAC,CAAC,KAAK,GAAG;CAEV,OAAO,GACJ,UACC,eACA,UACA,OAAO,YAAY;EACjB,IAAI,QAAQ,WAAW,GAAG;GAExB,MAAM,EAAE,OAAO,iBAAiB,QAAQ;GACxC,MAAM,EAAE,cAAc,iBAAiB,EAAE;GACzC,MAAM,kBAAkB,aAAa,QAAQ,UAAU,cAAc,MAAM,cAAc,IAAI,GAAG,KAAK;GACrG,MAAM,OAAO,MAAM,GAAG,sBAAsB,CAAC,MAAM,eAAe,OAAO,cAAc,KAAK;GAC5F,MAAM,WAAW,GAAG,QAAQ,MAAM,IAAI;GACtC,kBAAkB,MAAM,QAAQ;GAChC,OAAO,CAAC,sBAAsB,IAAI,QAAQ,CAAC;EAC7C;EAEA,MAAM,EAAE,OAAO,cAAc,OAAO,WAAW,QAAQ;EACvD,MAAM,EAAE,cAAc,iBAAiB,EAAE;EACzC,MAAM,kBAAkB,aAAa,QAAQ,UAAU,cAAc,MAAM,cAAc,IAAI,GAAG,KAAK;EAGrG,MAAM,OAAO,sBAAsB,OAAO,OAAO;EACjD,MAAM,cAAc,CAAC;GAAE,YAAY;GAAO,QAAQ;EAAM,GAAG,GAAG,KAAK,KAAK,MAAM,EAAE,MAAM,CAAC;EACvF,MAAM,eAAe,+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,CAAC,eAAe,SAAS,aAAa,YAAY,CAAC;GACzD,UAAU,CAAC;EACb;EAEA,MAAM,OAAO,MAAM,GAAG,sBAAsB,CAC1C,MACA,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,YAAY,gBAAgB,CAChC,CAAC,CACA,KAAK,QAAQ;AAClB"}
+{"version":3,"file":"findPaginatedDataLoader.js","names":[],"sources":["../../src/dataloaders/findPaginatedDataLoader.ts"],"sourcesContent":["import type { Entity } from \"../Entity.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor, getEmInternalApi } from \"../EntityManager.ts\";\nimport { getMetadata } from \"../EntityMetadata.ts\";\nimport { buildHintTree } from \"../HintTree.ts\";\nimport type { LoadHint } from \"../loadHints.ts\";\nimport { hintKey } from \"../normalizeHints.ts\";\nimport type { FilterAndSettings } from \"../queries/find/EntityFilter.ts\";\nimport { type ParsedFindQuery, parseFindQuery } from \"../queries/find/QueryParser.ts\";\nimport { buildUnnestCte } from \"../unnest.ts\";\nimport {\n  collectAndReplaceArgs,\n  collectValues,\n  createColumnValuesFromPrepared,\n  filterDeletedEntities,\n  findOperation,\n  getBatchKeyFromGenericStructure,\n  queryFilterHash,\n} from \"./findDataLoader.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  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":";;;;;;;;;AA6BA,SAAgB,wBACd,IACA,MACA,QACA,MACc;CACd,MAAM,EAAE,OAAO,OAAO,QAAQ,GAAG,SAAS;CAC1C,MAAM,OAAO,YAAY,IAAI;CAC7B,MAAM,QAAQ,eAAe,MAAM,OAAO,IAAI;CAC9C,MAAM,EAAE,iBAAiB,GAAG,cAAc,CAAC,MAAM,eAAe,OAAO;EAAE,GAAG;EAAM;EAAO;EAAQ,YAAY;CAAM,CAAC;CACpH,MAAM,WAAkB,CAAC;CACzB,cAAc,UAAU,KAAK;CAC7B,MAAM,WAAW;EACf;EACA;EACA;EACA;EACA,OAAO,aAAa;EACpB,QAAQ,aAAa;CACvB;CACA,MAAM,WAAW;EACf,gCAAgC,MAAM,KAAK;EAC3C,QAAQ,IAAI;EACZ,aAAa;EACb,aAAa;CACf,CAAC,CAAC,KAAK,GAAG;CAEV,OAAO,GACJ,UACC,eACA,UACA,OAAO,YAAY;EACjB,IAAI,QAAQ,WAAW,GAAG;GAExB,MAAM,EAAE,OAAO,iBAAiB,QAAQ;GACxC,MAAM,EAAE,cAAc,iBAAiB,EAAE;GACzC,MAAM,kBAAkB,aAAa,QAAQ,UAAU,cAAc,MAAM,cAAc,IAAI,GAAG,KAAK;GACrG,MAAM,OAAO,MAAM,GAAG,sBAAsB,CAAC,MAAM,eAAe,OAAO,cAAc,KAAK;GAC5F,MAAM,WAAW,GAAG,QAAQ,MAAM,IAAI;GACtC,kBAAkB,MAAM,QAAQ;GAChC,OAAO,CAAC,sBAAsB,IAAI,QAAQ,CAAC;EAC7C;EAEA,MAAM,EAAE,OAAO,cAAc,OAAO,WAAW,QAAQ;EACvD,MAAM,EAAE,cAAc,iBAAiB,EAAE;EACzC,MAAM,kBAAkB,aAAa,QAAQ,UAAU,cAAc,MAAM,cAAc,IAAI,GAAG,KAAK;EAGrG,MAAM,OAAO,sBAAsB,OAAO,OAAO;EACjD,MAAM,cAAc,CAAC;GAAE,YAAY;GAAO,QAAQ;EAAM,GAAG,GAAG,KAAK,KAAK,MAAM,EAAE,MAAM,CAAC;EACvF,MAAM,eAAe,+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,CAAC,eAAe,SAAS,aAAa,YAAY,CAAC;GACzD,UAAU,CAAC;EACb;EAEA,MAAM,OAAO,MAAM,GAAG,sBAAsB,CAC1C,MACA,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,YAAY,gBAAgB,CAChC,CAAC,CACA,KAAK,QAAQ;AAClB"}

package/build/dataloaders/lensDataLoader.cjs

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
+const require_utils = require("../utils.cjs");
 const require_keys = require("../keys.cjs");
 const require_EntityMetadata = require("../EntityMetadata.cjs");
-const require_utils = require("../utils.cjs");
 const require_loadLens = require("../loadLens.cjs");
 require("../EntityManager.cjs");
 require("../Entity.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
 //#region src/dataloaders/lensDataLoader.ts
 const lensOperation = "lens";
 /**
@@ -45,8 +45,8 @@ function lensDataLoader(em, type, startIsArray, paths) {
 			},
 			orderBys: []
 		};
-		require_QueryParser.addTablePerClassJoinsAndClassTag(query, target, alias, true);
-		require_QueryParser.maybeAddOrderBy(query, target, alias);
+		require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, target, alias, true);
+		require_queries_find_QueryParser.maybeAddOrderBy(query, target, alias);
 		function maybeAddNotSoftDeleted(other, alias) {
 			const { deletedAt } = require_EntityMetadata.getBaseMeta(other).timestampFields ?? {};
 			if (deletedAt) {

package/build/dataloaders/lensDataLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"lensDataLoader.cjs","names":["abbreviation","getMetadata","mapPathsToTarget","getBaseMeta","deTagIds","groupBy","tagId"],"sources":["../../src/dataloaders/lensDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor, type TaggedId } from \"../EntityManager.ts\";\nimport {\n  type EntityMetadata,\n  type ManyToOneField,\n  type OneToManyField,\n  type OneToOneField,\n  getBaseMeta,\n  getMetadata,\n} from \"../EntityMetadata.ts\";\nimport { deTagIds, tagId } from \"../keys.ts\";\nimport { mapPathsToTarget } from \"../loadLens.ts\";\nimport {\n  type ColumnCondition,\n  type ParsedFindQuery,\n  type ParsedOrderBy,\n  type ParsedTable,\n  addTablePerClassJoinsAndClassTag,\n  maybeAddOrderBy,\n} from \"../QueryParser.ts\";\nimport { abbreviation, groupBy } from \"../utils.ts\";\n\nexport const lensOperation = \"lens\";\n\n/**\n * Loads lens paths via SQL.\n *\n * I.e. instead of loading `author.load(a => a.books.reviews)` by pulling all\n * Books into memory, we do a join from the Author to BookReviews.\n */\nexport function lensDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  startIsArray: boolean,\n  paths: string[],\n): DataLoader<TaggedId, T | T[]> {\n  // Batch lens loads by type + path to avoid N+1s\n  const batchKey = `${type.name}-${paths.join(\"/\")}`;\n  return em.getLoader(lensOperation, batchKey, async (sourceIds) => {\n    const aliases: Record<string, number> = {};\n    function getAlias(tableName: string): string {\n      const abbrev = abbreviation(tableName);\n      const i = aliases[abbrev] || 0;\n      aliases[abbrev] = i + 1;\n      return i === 0 ? abbrev : `${abbrev}${i}`;\n    }\n\n    // br.load(br => br.book.author)\n    // select br.id as __source_id, a.*\n    // from authors a\n    // join books b ON b.author_id = a.id\n    // join book_reviews br ON br.book_id = br.id\n    // where br.id in (keys)\n    // source=BR, target=Author, fields=books,bookReviews\n\n    // a.load(a => a.books.reviews)\n    // select b.author_id as __source_id, br.*\n    // from book_reviews br\n    // join books b on b.id = br.book_id\n    // where b.author_id in (keys)\n\n    const source = getMetadata(type);\n    // Walk source -> paths -> the target, and return the target -> source fields\n    const [target, fields] = mapPathsToTarget(source, paths);\n    let resultIsArray = startIsArray;\n\n    const alias = getAlias(target.tableName);\n    const selects = [`\"${alias}\".*`];\n    const tables: ParsedTable[] = [{ alias, join: \"primary\", table: target.tableName }];\n    const conditions: ColumnCondition[] = [];\n    const orderBys: ParsedOrderBy[] = [];\n    const query: ParsedFindQuery = { selects, tables, condition: { kind: \"exp\", op: \"and\", conditions }, orderBys };\n    addTablePerClassJoinsAndClassTag(query, target, alias, true);\n    maybeAddOrderBy(query, target, alias);\n\n    function maybeAddNotSoftDeleted(other: EntityMetadata, alias: string): void {\n      const { deletedAt } = getBaseMeta(other).timestampFields ?? {};\n      if (deletedAt) {\n        const column = other.allFields[deletedAt].serde?.columns[0]!;\n        conditions.push({\n          kind: \"column\",\n          alias,\n          column: column.columnName,\n          dbType: column.dbType,\n          cond: { kind: \"is-null\" },\n        });\n      }\n    }\n\n    let lastAlias = alias;\n    fields.forEach(([, field], i) => {\n      const isLast = i === fields.length - 1;\n      switch (field.kind) {\n        case \"o2o\":\n        case \"o2m\": {\n          // This is `Publisher.authors` and we want to join in the authors table,\n          // so get the `Author.publisher` field to know the column name\n          const other = field.otherMetadata();\n          const m2o = other.allFields[field.otherFieldName] as ManyToOneField;\n          const alias = getAlias(other.tableName);\n          tables.push({\n            alias,\n            join: \"inner\",\n            table: other.tableName,\n            col1: `${alias}.${m2o.serde.columns[0].columnName}`,\n            col2: `${lastAlias}.id`,\n          });\n          maybeAddNotSoftDeleted(other, alias);\n          if (isLast) {\n            selects.push(`\"${alias}\".id as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias,\n              column: \"id\",\n              dbType: other.idDbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n          }\n          lastAlias = alias;\n          break;\n        }\n        case \"m2o\": {\n          // This is `Book.author` and we want to join in the authors table\n          const other = field.otherMetadata();\n          const otherField = other.fields[field.otherFieldName] as OneToManyField | OneToOneField;\n          const alias = getAlias(other.tableName);\n          if (!isLast) {\n            tables.push({\n              alias,\n              join: \"inner\",\n              table: other.tableName,\n              col1: `${alias}.id`,\n              col2: `${lastAlias}.${field.serde.columns[0].columnName}`,\n            });\n            maybeAddNotSoftDeleted(other, alias);\n          } else {\n            selects.push(`\"${lastAlias}\".${field.serde.columns[0].columnName} as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias: lastAlias,\n              column: field.serde.columns[0].columnName,\n              dbType: field.serde.columns[0].dbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n            // Need to add filter for soft-deleted...\n          }\n          resultIsArray = otherField.kind === \"o2o\" ? resultIsArray : true;\n          lastAlias = alias;\n          break;\n        }\n        case \"m2m\": {\n          // This is `Book.tags` and we want to join through the m2m table\n          const other = field.otherMetadata();\n          const alias = getAlias(other.tableName);\n          tables.push({\n            alias: `${alias}_m2m`,\n            join: \"inner\",\n            table: field.joinTableName,\n            col1: `${alias}_m2m.${field.columnNames[0]}`,\n            col2: `${lastAlias}.id`,\n          });\n          // If this is the last table, we could skip this join like we do for m2os\n          tables.push({\n            alias,\n            join: \"inner\",\n            table: other.tableName,\n            col1: `${alias}.id`,\n            col2: `${alias}_m2m.${field.columnNames[1]}`,\n          });\n          maybeAddNotSoftDeleted(other, alias);\n          if (isLast) {\n            selects.push(`\"${alias}\".id as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias,\n              column: \"id\",\n              dbType: other.idDbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n          }\n          resultIsArray = true;\n          lastAlias = alias;\n          break;\n        }\n        default:\n          throw new Error(\"Unsupported field kind: \" + field.kind);\n      }\n    });\n\n    // Get back `__source_id, target.*`\n    const rows = await em[\"executeFind\"](target, lensOperation, query, {});\n\n    // Group the target entities (i.e. BookReview) by the source id we reached them from.\n    const entitiesBySourceId = new Map(\n      [...groupBy(rows, (row) => row[\"__source_id\"]).entries()].map(([sourceId, rows]) => {\n        // We may technically re-hydrate the same entity twice if it was reached\n        // via multiple sources, but that should be fine/get deduped by hydrate.\n        return [tagId(source, sourceId), em.hydrate(target.cstr, rows)];\n      }),\n    );\n\n    // Re-order the output by the batched input\n    return sourceIds.map((id) => {\n      const result = entitiesBySourceId.get(id);\n      return resultIsArray ? [...new Set(result ?? [])] : result?.[0];\n    });\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"lensDataLoader.cjs","names":["abbreviation","getMetadata","mapPathsToTarget","getBaseMeta","deTagIds","groupBy","tagId"],"sources":["../../src/dataloaders/lensDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor, type TaggedId } from \"../EntityManager.ts\";\nimport {\n  type EntityMetadata,\n  type ManyToOneField,\n  type OneToManyField,\n  type OneToOneField,\n  getBaseMeta,\n  getMetadata,\n} from \"../EntityMetadata.ts\";\nimport { deTagIds, tagId } from \"../keys.ts\";\nimport { mapPathsToTarget } from \"../loadLens.ts\";\nimport {\n  type ParsedFindQuery,\n  type ParsedOrderBy,\n  type ParsedTable,\n  addTablePerClassJoinsAndClassTag,\n  maybeAddOrderBy,\n} from \"../queries/find/QueryParser.ts\";\nimport type { ColumnCondition } from \"../queries/parsedConditions.ts\";\nimport { abbreviation, groupBy } from \"../utils.ts\";\n\nexport const lensOperation = \"lens\";\n\n/**\n * Loads lens paths via SQL.\n *\n * I.e. instead of loading `author.load(a => a.books.reviews)` by pulling all\n * Books into memory, we do a join from the Author to BookReviews.\n */\nexport function lensDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  startIsArray: boolean,\n  paths: string[],\n): DataLoader<TaggedId, T | T[]> {\n  // Batch lens loads by type + path to avoid N+1s\n  const batchKey = `${type.name}-${paths.join(\"/\")}`;\n  return em.getLoader(lensOperation, batchKey, async (sourceIds) => {\n    const aliases: Record<string, number> = {};\n    function getAlias(tableName: string): string {\n      const abbrev = abbreviation(tableName);\n      const i = aliases[abbrev] || 0;\n      aliases[abbrev] = i + 1;\n      return i === 0 ? abbrev : `${abbrev}${i}`;\n    }\n\n    // br.load(br => br.book.author)\n    // select br.id as __source_id, a.*\n    // from authors a\n    // join books b ON b.author_id = a.id\n    // join book_reviews br ON br.book_id = br.id\n    // where br.id in (keys)\n    // source=BR, target=Author, fields=books,bookReviews\n\n    // a.load(a => a.books.reviews)\n    // select b.author_id as __source_id, br.*\n    // from book_reviews br\n    // join books b on b.id = br.book_id\n    // where b.author_id in (keys)\n\n    const source = getMetadata(type);\n    // Walk source -> paths -> the target, and return the target -> source fields\n    const [target, fields] = mapPathsToTarget(source, paths);\n    let resultIsArray = startIsArray;\n\n    const alias = getAlias(target.tableName);\n    const selects = [`\"${alias}\".*`];\n    const tables: ParsedTable[] = [{ alias, join: \"primary\", table: target.tableName }];\n    const conditions: ColumnCondition[] = [];\n    const orderBys: ParsedOrderBy[] = [];\n    const query: ParsedFindQuery = { selects, tables, condition: { kind: \"exp\", op: \"and\", conditions }, orderBys };\n    addTablePerClassJoinsAndClassTag(query, target, alias, true);\n    maybeAddOrderBy(query, target, alias);\n\n    function maybeAddNotSoftDeleted(other: EntityMetadata, alias: string): void {\n      const { deletedAt } = getBaseMeta(other).timestampFields ?? {};\n      if (deletedAt) {\n        const column = other.allFields[deletedAt].serde?.columns[0]!;\n        conditions.push({\n          kind: \"column\",\n          alias,\n          column: column.columnName,\n          dbType: column.dbType,\n          cond: { kind: \"is-null\" },\n        });\n      }\n    }\n\n    let lastAlias = alias;\n    fields.forEach(([, field], i) => {\n      const isLast = i === fields.length - 1;\n      switch (field.kind) {\n        case \"o2o\":\n        case \"o2m\": {\n          // This is `Publisher.authors` and we want to join in the authors table,\n          // so get the `Author.publisher` field to know the column name\n          const other = field.otherMetadata();\n          const m2o = other.allFields[field.otherFieldName] as ManyToOneField;\n          const alias = getAlias(other.tableName);\n          tables.push({\n            alias,\n            join: \"inner\",\n            table: other.tableName,\n            col1: `${alias}.${m2o.serde.columns[0].columnName}`,\n            col2: `${lastAlias}.id`,\n          });\n          maybeAddNotSoftDeleted(other, alias);\n          if (isLast) {\n            selects.push(`\"${alias}\".id as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias,\n              column: \"id\",\n              dbType: other.idDbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n          }\n          lastAlias = alias;\n          break;\n        }\n        case \"m2o\": {\n          // This is `Book.author` and we want to join in the authors table\n          const other = field.otherMetadata();\n          const otherField = other.fields[field.otherFieldName] as OneToManyField | OneToOneField;\n          const alias = getAlias(other.tableName);\n          if (!isLast) {\n            tables.push({\n              alias,\n              join: \"inner\",\n              table: other.tableName,\n              col1: `${alias}.id`,\n              col2: `${lastAlias}.${field.serde.columns[0].columnName}`,\n            });\n            maybeAddNotSoftDeleted(other, alias);\n          } else {\n            selects.push(`\"${lastAlias}\".${field.serde.columns[0].columnName} as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias: lastAlias,\n              column: field.serde.columns[0].columnName,\n              dbType: field.serde.columns[0].dbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n            // Need to add filter for soft-deleted...\n          }\n          resultIsArray = otherField.kind === \"o2o\" ? resultIsArray : true;\n          lastAlias = alias;\n          break;\n        }\n        case \"m2m\": {\n          // This is `Book.tags` and we want to join through the m2m table\n          const other = field.otherMetadata();\n          const alias = getAlias(other.tableName);\n          tables.push({\n            alias: `${alias}_m2m`,\n            join: \"inner\",\n            table: field.joinTableName,\n            col1: `${alias}_m2m.${field.columnNames[0]}`,\n            col2: `${lastAlias}.id`,\n          });\n          // If this is the last table, we could skip this join like we do for m2os\n          tables.push({\n            alias,\n            join: \"inner\",\n            table: other.tableName,\n            col1: `${alias}.id`,\n            col2: `${alias}_m2m.${field.columnNames[1]}`,\n          });\n          maybeAddNotSoftDeleted(other, alias);\n          if (isLast) {\n            selects.push(`\"${alias}\".id as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias,\n              column: \"id\",\n              dbType: other.idDbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n          }\n          resultIsArray = true;\n          lastAlias = alias;\n          break;\n        }\n        default:\n          throw new Error(\"Unsupported field kind: \" + field.kind);\n      }\n    });\n\n    // Get back `__source_id, target.*`\n    const rows = await em[\"executeFind\"](target, lensOperation, query, {});\n\n    // Group the target entities (i.e. BookReview) by the source id we reached them from.\n    const entitiesBySourceId = new Map(\n      [...groupBy(rows, (row) => row[\"__source_id\"]).entries()].map(([sourceId, rows]) => {\n        // We may technically re-hydrate the same entity twice if it was reached\n        // via multiple sources, but that should be fine/get deduped by hydrate.\n        return [tagId(source, sourceId), em.hydrate(target.cstr, rows)];\n      }),\n    );\n\n    // Re-order the output by the batched input\n    return sourceIds.map((id) => {\n      const result = entitiesBySourceId.get(id);\n      return resultIsArray ? [...new Set(result ?? [])] : result?.[0];\n    });\n  });\n}\n"],"mappings":"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"}

package/build/dataloaders/lensDataLoader.js

@@ -1,10 +1,10 @@
+import { addTablePerClassJoinsAndClassTag, maybeAddOrderBy } from "../queries/find/QueryParser.js";
+import { abbreviation, groupBy } from "../utils.js";
 import { deTagIds, tagId } from "../keys.js";
 import { getBaseMeta, getMetadata } from "../EntityMetadata.js";
-import { abbreviation, groupBy } from "../utils.js";
 import { mapPathsToTarget } from "../loadLens.js";
 import "../EntityManager.js";
 import "../Entity.js";
-import { addTablePerClassJoinsAndClassTag, maybeAddOrderBy } from "../QueryParser.js";
 //#region src/dataloaders/lensDataLoader.ts
 const lensOperation = "lens";
 /**

package/build/dataloaders/lensDataLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"lensDataLoader.js","names":[],"sources":["../../src/dataloaders/lensDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor, type TaggedId } from \"../EntityManager.ts\";\nimport {\n  type EntityMetadata,\n  type ManyToOneField,\n  type OneToManyField,\n  type OneToOneField,\n  getBaseMeta,\n  getMetadata,\n} from \"../EntityMetadata.ts\";\nimport { deTagIds, tagId } from \"../keys.ts\";\nimport { mapPathsToTarget } from \"../loadLens.ts\";\nimport {\n  type ColumnCondition,\n  type ParsedFindQuery,\n  type ParsedOrderBy,\n  type ParsedTable,\n  addTablePerClassJoinsAndClassTag,\n  maybeAddOrderBy,\n} from \"../QueryParser.ts\";\nimport { abbreviation, groupBy } from \"../utils.ts\";\n\nexport const lensOperation = \"lens\";\n\n/**\n * Loads lens paths via SQL.\n *\n * I.e. instead of loading `author.load(a => a.books.reviews)` by pulling all\n * Books into memory, we do a join from the Author to BookReviews.\n */\nexport function lensDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  startIsArray: boolean,\n  paths: string[],\n): DataLoader<TaggedId, T | T[]> {\n  // Batch lens loads by type + path to avoid N+1s\n  const batchKey = `${type.name}-${paths.join(\"/\")}`;\n  return em.getLoader(lensOperation, batchKey, async (sourceIds) => {\n    const aliases: Record<string, number> = {};\n    function getAlias(tableName: string): string {\n      const abbrev = abbreviation(tableName);\n      const i = aliases[abbrev] || 0;\n      aliases[abbrev] = i + 1;\n      return i === 0 ? abbrev : `${abbrev}${i}`;\n    }\n\n    // br.load(br => br.book.author)\n    // select br.id as __source_id, a.*\n    // from authors a\n    // join books b ON b.author_id = a.id\n    // join book_reviews br ON br.book_id = br.id\n    // where br.id in (keys)\n    // source=BR, target=Author, fields=books,bookReviews\n\n    // a.load(a => a.books.reviews)\n    // select b.author_id as __source_id, br.*\n    // from book_reviews br\n    // join books b on b.id = br.book_id\n    // where b.author_id in (keys)\n\n    const source = getMetadata(type);\n    // Walk source -> paths -> the target, and return the target -> source fields\n    const [target, fields] = mapPathsToTarget(source, paths);\n    let resultIsArray = startIsArray;\n\n    const alias = getAlias(target.tableName);\n    const selects = [`\"${alias}\".*`];\n    const tables: ParsedTable[] = [{ alias, join: \"primary\", table: target.tableName }];\n    const conditions: ColumnCondition[] = [];\n    const orderBys: ParsedOrderBy[] = [];\n    const query: ParsedFindQuery = { selects, tables, condition: { kind: \"exp\", op: \"and\", conditions }, orderBys };\n    addTablePerClassJoinsAndClassTag(query, target, alias, true);\n    maybeAddOrderBy(query, target, alias);\n\n    function maybeAddNotSoftDeleted(other: EntityMetadata, alias: string): void {\n      const { deletedAt } = getBaseMeta(other).timestampFields ?? {};\n      if (deletedAt) {\n        const column = other.allFields[deletedAt].serde?.columns[0]!;\n        conditions.push({\n          kind: \"column\",\n          alias,\n          column: column.columnName,\n          dbType: column.dbType,\n          cond: { kind: \"is-null\" },\n        });\n      }\n    }\n\n    let lastAlias = alias;\n    fields.forEach(([, field], i) => {\n      const isLast = i === fields.length - 1;\n      switch (field.kind) {\n        case \"o2o\":\n        case \"o2m\": {\n          // This is `Publisher.authors` and we want to join in the authors table,\n          // so get the `Author.publisher` field to know the column name\n          const other = field.otherMetadata();\n          const m2o = other.allFields[field.otherFieldName] as ManyToOneField;\n          const alias = getAlias(other.tableName);\n          tables.push({\n            alias,\n            join: \"inner\",\n            table: other.tableName,\n            col1: `${alias}.${m2o.serde.columns[0].columnName}`,\n            col2: `${lastAlias}.id`,\n          });\n          maybeAddNotSoftDeleted(other, alias);\n          if (isLast) {\n            selects.push(`\"${alias}\".id as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias,\n              column: \"id\",\n              dbType: other.idDbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n          }\n          lastAlias = alias;\n          break;\n        }\n        case \"m2o\": {\n          // This is `Book.author` and we want to join in the authors table\n          const other = field.otherMetadata();\n          const otherField = other.fields[field.otherFieldName] as OneToManyField | OneToOneField;\n          const alias = getAlias(other.tableName);\n          if (!isLast) {\n            tables.push({\n              alias,\n              join: \"inner\",\n              table: other.tableName,\n              col1: `${alias}.id`,\n              col2: `${lastAlias}.${field.serde.columns[0].columnName}`,\n            });\n            maybeAddNotSoftDeleted(other, alias);\n          } else {\n            selects.push(`\"${lastAlias}\".${field.serde.columns[0].columnName} as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias: lastAlias,\n              column: field.serde.columns[0].columnName,\n              dbType: field.serde.columns[0].dbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n            // Need to add filter for soft-deleted...\n          }\n          resultIsArray = otherField.kind === \"o2o\" ? resultIsArray : true;\n          lastAlias = alias;\n          break;\n        }\n        case \"m2m\": {\n          // This is `Book.tags` and we want to join through the m2m table\n          const other = field.otherMetadata();\n          const alias = getAlias(other.tableName);\n          tables.push({\n            alias: `${alias}_m2m`,\n            join: \"inner\",\n            table: field.joinTableName,\n            col1: `${alias}_m2m.${field.columnNames[0]}`,\n            col2: `${lastAlias}.id`,\n          });\n          // If this is the last table, we could skip this join like we do for m2os\n          tables.push({\n            alias,\n            join: \"inner\",\n            table: other.tableName,\n            col1: `${alias}.id`,\n            col2: `${alias}_m2m.${field.columnNames[1]}`,\n          });\n          maybeAddNotSoftDeleted(other, alias);\n          if (isLast) {\n            selects.push(`\"${alias}\".id as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias,\n              column: \"id\",\n              dbType: other.idDbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n          }\n          resultIsArray = true;\n          lastAlias = alias;\n          break;\n        }\n        default:\n          throw new Error(\"Unsupported field kind: \" + field.kind);\n      }\n    });\n\n    // Get back `__source_id, target.*`\n    const rows = await em[\"executeFind\"](target, lensOperation, query, {});\n\n    // Group the target entities (i.e. BookReview) by the source id we reached them from.\n    const entitiesBySourceId = new Map(\n      [...groupBy(rows, (row) => row[\"__source_id\"]).entries()].map(([sourceId, rows]) => {\n        // We may technically re-hydrate the same entity twice if it was reached\n        // via multiple sources, but that should be fine/get deduped by hydrate.\n        return [tagId(source, sourceId), em.hydrate(target.cstr, rows)];\n      }),\n    );\n\n    // Re-order the output by the batched input\n    return sourceIds.map((id) => {\n      const result = entitiesBySourceId.get(id);\n      return resultIsArray ? [...new Set(result ?? [])] : result?.[0];\n    });\n  });\n}\n"],"mappings":";;;;;;;;AAwBA,MAAa,gBAAgB;;;;;;;AAQ7B,SAAgB,eACd,IACA,MACA,cACA,OAC+B;CAE/B,MAAM,WAAW,GAAG,KAAK,KAAK,GAAG,MAAM,KAAK,GAAG;CAC/C,OAAO,GAAG,UAAU,eAAe,UAAU,OAAO,cAAc;EAChE,MAAM,UAAkC,CAAC;EACzC,SAAS,SAAS,WAA2B;GAC3C,MAAM,SAAS,aAAa,SAAS;GACrC,MAAM,IAAI,QAAQ,WAAW;GAC7B,QAAQ,UAAU,IAAI;GACtB,OAAO,MAAM,IAAI,SAAS,GAAG,SAAS;EACxC;EAgBA,MAAM,SAAS,YAAY,IAAI;EAE/B,MAAM,CAAC,QAAQ,UAAU,iBAAiB,QAAQ,KAAK;EACvD,IAAI,gBAAgB;EAEpB,MAAM,QAAQ,SAAS,OAAO,SAAS;EACvC,MAAM,UAAU,CAAC,IAAI,MAAM,IAAI;EAC/B,MAAM,SAAwB,CAAC;GAAE;GAAO,MAAM;GAAW,OAAO,OAAO;EAAU,CAAC;EAClF,MAAM,aAAgC,CAAC;EAEvC,MAAM,QAAyB;GAAE;GAAS;GAAQ,WAAW;IAAE,MAAM;IAAO,IAAI;IAAO;GAAW;GAAG,UAAA,CAAO;EAAE;EAC9G,iCAAiC,OAAO,QAAQ,OAAO,IAAI;EAC3D,gBAAgB,OAAO,QAAQ,KAAK;EAEpC,SAAS,uBAAuB,OAAuB,OAAqB;GAC1E,MAAM,EAAE,cAAc,YAAY,KAAK,CAAC,CAAC,mBAAmB,CAAC;GAC7D,IAAI,WAAW;IACb,MAAM,SAAS,MAAM,UAAU,UAAU,CAAC,OAAO,QAAQ;IACzD,WAAW,KAAK;KACd,MAAM;KACN;KACA,QAAQ,OAAO;KACf,QAAQ,OAAO;KACf,MAAM,EAAE,MAAM,UAAU;IAC1B,CAAC;GACH;EACF;EAEA,IAAI,YAAY;EAChB,OAAO,SAAS,GAAG,QAAQ,MAAM;GAC/B,MAAM,SAAS,MAAM,OAAO,SAAS;GACrC,QAAQ,MAAM,MAAd;IACE,KAAK;IACL,KAAK,OAAO;KAGV,MAAM,QAAQ,MAAM,cAAc;KAClC,MAAM,MAAM,MAAM,UAAU,MAAM;KAClC,MAAM,QAAQ,SAAS,MAAM,SAAS;KACtC,OAAO,KAAK;MACV;MACA,MAAM;MACN,OAAO,MAAM;MACb,MAAM,GAAG,MAAM,GAAG,IAAI,MAAM,QAAQ,EAAE,CAAC;MACvC,MAAM,GAAG,UAAU;KACrB,CAAC;KACD,uBAAuB,OAAO,KAAK;KACnC,IAAI,QAAQ;MACV,QAAQ,KAAK,IAAI,MAAM,oBAAoB;MAC3C,WAAW,KAAK;OACd,MAAM;OACN;OACA,QAAQ;OACR,QAAQ,MAAM;OACd,MAAM;QAAE,MAAM;QAAM,OAAO,SAAS,QAAQ,SAAS;OAAE;MACzD,CAAC;KACH;KACA,YAAY;KACZ;IACF;IACA,KAAK,OAAO;KAEV,MAAM,QAAQ,MAAM,cAAc;KAClC,MAAM,aAAa,MAAM,OAAO,MAAM;KACtC,MAAM,QAAQ,SAAS,MAAM,SAAS;KACtC,IAAI,CAAC,QAAQ;MACX,OAAO,KAAK;OACV;OACA,MAAM;OACN,OAAO,MAAM;OACb,MAAM,GAAG,MAAM;OACf,MAAM,GAAG,UAAU,GAAG,MAAM,MAAM,QAAQ,EAAE,CAAC;MAC/C,CAAC;MACD,uBAAuB,OAAO,KAAK;KACrC,OAAO;MACL,QAAQ,KAAK,IAAI,UAAU,IAAI,MAAM,MAAM,QAAQ,EAAE,CAAC,WAAW,gBAAgB;MACjF,WAAW,KAAK;OACd,MAAM;OACN,OAAO;OACP,QAAQ,MAAM,MAAM,QAAQ,EAAE,CAAC;OAC/B,QAAQ,MAAM,MAAM,QAAQ,EAAE,CAAC;OAC/B,MAAM;QAAE,MAAM;QAAM,OAAO,SAAS,QAAQ,SAAS;OAAE;MACzD,CAAC;KAEH;KACA,gBAAgB,WAAW,SAAS,QAAQ,gBAAgB;KAC5D,YAAY;KACZ;IACF;IACA,KAAK,OAAO;KAEV,MAAM,QAAQ,MAAM,cAAc;KAClC,MAAM,QAAQ,SAAS,MAAM,SAAS;KACtC,OAAO,KAAK;MACV,OAAO,GAAG,MAAM;MAChB,MAAM;MACN,OAAO,MAAM;MACb,MAAM,GAAG,MAAM,OAAO,MAAM,YAAY;MACxC,MAAM,GAAG,UAAU;KACrB,CAAC;KAED,OAAO,KAAK;MACV;MACA,MAAM;MACN,OAAO,MAAM;MACb,MAAM,GAAG,MAAM;MACf,MAAM,GAAG,MAAM,OAAO,MAAM,YAAY;KAC1C,CAAC;KACD,uBAAuB,OAAO,KAAK;KACnC,IAAI,QAAQ;MACV,QAAQ,KAAK,IAAI,MAAM,oBAAoB;MAC3C,WAAW,KAAK;OACd,MAAM;OACN;OACA,QAAQ;OACR,QAAQ,MAAM;OACd,MAAM;QAAE,MAAM;QAAM,OAAO,SAAS,QAAQ,SAAS;OAAE;MACzD,CAAC;KACH;KACA,gBAAgB;KAChB,YAAY;KACZ;IACF;IACA,SACE,MAAM,IAAI,MAAM,6BAA6B,MAAM,IAAI;GAC3D;EACF,CAAC;EAGD,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,QAAQ,eAAe,OAAO,CAAC,CAAC;EAGrE,MAAM,qBAAqB,IAAI,IAC7B,CAAC,GAAG,QAAQ,OAAO,QAAQ,IAAI,cAAc,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,UAAU;GAGlF,OAAO,CAAC,MAAM,QAAQ,QAAQ,GAAG,GAAG,QAAQ,OAAO,MAAM,IAAI,CAAC;EAChE,CAAC,CACH;EAGA,OAAO,UAAU,KAAK,OAAO;GAC3B,MAAM,SAAS,mBAAmB,IAAI,EAAE;GACxC,OAAO,gBAAgB,CAAC,GAAG,IAAI,IAAI,UAAU,CAAC,CAAC,CAAC,IAAI,SAAS;EAC/D,CAAC;CACH,CAAC;AACH"}
+{"version":3,"file":"lensDataLoader.js","names":[],"sources":["../../src/dataloaders/lensDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor, type TaggedId } from \"../EntityManager.ts\";\nimport {\n  type EntityMetadata,\n  type ManyToOneField,\n  type OneToManyField,\n  type OneToOneField,\n  getBaseMeta,\n  getMetadata,\n} from \"../EntityMetadata.ts\";\nimport { deTagIds, tagId } from \"../keys.ts\";\nimport { mapPathsToTarget } from \"../loadLens.ts\";\nimport {\n  type ParsedFindQuery,\n  type ParsedOrderBy,\n  type ParsedTable,\n  addTablePerClassJoinsAndClassTag,\n  maybeAddOrderBy,\n} from \"../queries/find/QueryParser.ts\";\nimport type { ColumnCondition } from \"../queries/parsedConditions.ts\";\nimport { abbreviation, groupBy } from \"../utils.ts\";\n\nexport const lensOperation = \"lens\";\n\n/**\n * Loads lens paths via SQL.\n *\n * I.e. instead of loading `author.load(a => a.books.reviews)` by pulling all\n * Books into memory, we do a join from the Author to BookReviews.\n */\nexport function lensDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  startIsArray: boolean,\n  paths: string[],\n): DataLoader<TaggedId, T | T[]> {\n  // Batch lens loads by type + path to avoid N+1s\n  const batchKey = `${type.name}-${paths.join(\"/\")}`;\n  return em.getLoader(lensOperation, batchKey, async (sourceIds) => {\n    const aliases: Record<string, number> = {};\n    function getAlias(tableName: string): string {\n      const abbrev = abbreviation(tableName);\n      const i = aliases[abbrev] || 0;\n      aliases[abbrev] = i + 1;\n      return i === 0 ? abbrev : `${abbrev}${i}`;\n    }\n\n    // br.load(br => br.book.author)\n    // select br.id as __source_id, a.*\n    // from authors a\n    // join books b ON b.author_id = a.id\n    // join book_reviews br ON br.book_id = br.id\n    // where br.id in (keys)\n    // source=BR, target=Author, fields=books,bookReviews\n\n    // a.load(a => a.books.reviews)\n    // select b.author_id as __source_id, br.*\n    // from book_reviews br\n    // join books b on b.id = br.book_id\n    // where b.author_id in (keys)\n\n    const source = getMetadata(type);\n    // Walk source -> paths -> the target, and return the target -> source fields\n    const [target, fields] = mapPathsToTarget(source, paths);\n    let resultIsArray = startIsArray;\n\n    const alias = getAlias(target.tableName);\n    const selects = [`\"${alias}\".*`];\n    const tables: ParsedTable[] = [{ alias, join: \"primary\", table: target.tableName }];\n    const conditions: ColumnCondition[] = [];\n    const orderBys: ParsedOrderBy[] = [];\n    const query: ParsedFindQuery = { selects, tables, condition: { kind: \"exp\", op: \"and\", conditions }, orderBys };\n    addTablePerClassJoinsAndClassTag(query, target, alias, true);\n    maybeAddOrderBy(query, target, alias);\n\n    function maybeAddNotSoftDeleted(other: EntityMetadata, alias: string): void {\n      const { deletedAt } = getBaseMeta(other).timestampFields ?? {};\n      if (deletedAt) {\n        const column = other.allFields[deletedAt].serde?.columns[0]!;\n        conditions.push({\n          kind: \"column\",\n          alias,\n          column: column.columnName,\n          dbType: column.dbType,\n          cond: { kind: \"is-null\" },\n        });\n      }\n    }\n\n    let lastAlias = alias;\n    fields.forEach(([, field], i) => {\n      const isLast = i === fields.length - 1;\n      switch (field.kind) {\n        case \"o2o\":\n        case \"o2m\": {\n          // This is `Publisher.authors` and we want to join in the authors table,\n          // so get the `Author.publisher` field to know the column name\n          const other = field.otherMetadata();\n          const m2o = other.allFields[field.otherFieldName] as ManyToOneField;\n          const alias = getAlias(other.tableName);\n          tables.push({\n            alias,\n            join: \"inner\",\n            table: other.tableName,\n            col1: `${alias}.${m2o.serde.columns[0].columnName}`,\n            col2: `${lastAlias}.id`,\n          });\n          maybeAddNotSoftDeleted(other, alias);\n          if (isLast) {\n            selects.push(`\"${alias}\".id as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias,\n              column: \"id\",\n              dbType: other.idDbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n          }\n          lastAlias = alias;\n          break;\n        }\n        case \"m2o\": {\n          // This is `Book.author` and we want to join in the authors table\n          const other = field.otherMetadata();\n          const otherField = other.fields[field.otherFieldName] as OneToManyField | OneToOneField;\n          const alias = getAlias(other.tableName);\n          if (!isLast) {\n            tables.push({\n              alias,\n              join: \"inner\",\n              table: other.tableName,\n              col1: `${alias}.id`,\n              col2: `${lastAlias}.${field.serde.columns[0].columnName}`,\n            });\n            maybeAddNotSoftDeleted(other, alias);\n          } else {\n            selects.push(`\"${lastAlias}\".${field.serde.columns[0].columnName} as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias: lastAlias,\n              column: field.serde.columns[0].columnName,\n              dbType: field.serde.columns[0].dbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n            // Need to add filter for soft-deleted...\n          }\n          resultIsArray = otherField.kind === \"o2o\" ? resultIsArray : true;\n          lastAlias = alias;\n          break;\n        }\n        case \"m2m\": {\n          // This is `Book.tags` and we want to join through the m2m table\n          const other = field.otherMetadata();\n          const alias = getAlias(other.tableName);\n          tables.push({\n            alias: `${alias}_m2m`,\n            join: \"inner\",\n            table: field.joinTableName,\n            col1: `${alias}_m2m.${field.columnNames[0]}`,\n            col2: `${lastAlias}.id`,\n          });\n          // If this is the last table, we could skip this join like we do for m2os\n          tables.push({\n            alias,\n            join: \"inner\",\n            table: other.tableName,\n            col1: `${alias}.id`,\n            col2: `${alias}_m2m.${field.columnNames[1]}`,\n          });\n          maybeAddNotSoftDeleted(other, alias);\n          if (isLast) {\n            selects.push(`\"${alias}\".id as __source_id`);\n            conditions.push({\n              kind: \"column\",\n              alias,\n              column: \"id\",\n              dbType: other.idDbType,\n              cond: { kind: \"in\", value: deTagIds(source, sourceIds) },\n            });\n          }\n          resultIsArray = true;\n          lastAlias = alias;\n          break;\n        }\n        default:\n          throw new Error(\"Unsupported field kind: \" + field.kind);\n      }\n    });\n\n    // Get back `__source_id, target.*`\n    const rows = await em[\"executeFind\"](target, lensOperation, query, {});\n\n    // Group the target entities (i.e. BookReview) by the source id we reached them from.\n    const entitiesBySourceId = new Map(\n      [...groupBy(rows, (row) => row[\"__source_id\"]).entries()].map(([sourceId, rows]) => {\n        // We may technically re-hydrate the same entity twice if it was reached\n        // via multiple sources, but that should be fine/get deduped by hydrate.\n        return [tagId(source, sourceId), em.hydrate(target.cstr, rows)];\n      }),\n    );\n\n    // Re-order the output by the batched input\n    return sourceIds.map((id) => {\n      const result = entitiesBySourceId.get(id);\n      return resultIsArray ? [...new Set(result ?? [])] : result?.[0];\n    });\n  });\n}\n"],"mappings":"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"}

package/build/dataloaders/manyToManyFindDataLoader.cjs

@@ -1,9 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_keys = require("../keys.cjs");
 const require_utils = require("../utils.cjs");
-require("../index.cjs");
-require("../EntityManager.cjs");
-require("../Entity.cjs");
+const require_keys = require("../keys.cjs");
 //#region src/dataloaders/manyToManyFindDataLoader.ts
 const manyToManyFindOperation = "m2m-find";
 /** Batches m2m.find/include calls (i.e. that don't fully load the m2m relation). */

package/build/dataloaders/manyToManyFindDataLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"manyToManyFindDataLoader.cjs","names":["abbreviation","keyToNumber","tagId"],"sources":["../../src/dataloaders/manyToManyFindDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager } from \"../EntityManager.ts\";\nimport {\n  type ManyToManyCollection,\n  type ManyToManyLargeCollection,\n  type ParsedFindQuery,\n  keyToNumber,\n  tagId,\n} from \"../index.ts\";\nimport { abbreviation } from \"../utils.ts\";\n\nexport const manyToManyFindOperation = \"m2m-find\";\n\n/** Batches m2m.find/include calls (i.e. that don't fully load the m2m relation). */\nexport function manyToManyFindDataLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: ManyToManyCollection<T, U> | ManyToManyLargeCollection<T, U>,\n): DataLoader<string, boolean> {\n  return em.getLoader(manyToManyFindOperation, collection.joinTableName, (keys) => load(collection, keys));\n}\n\nasync function load<T extends Entity, U extends Entity>(\n  collection: ManyToManyCollection<T, U> | ManyToManyLargeCollection<T, U>,\n  keys: ReadonlyArray<string>,\n): Promise<boolean[]> {\n  const { joinTableName } = collection;\n  const { em } = collection.entity;\n\n  const alias = abbreviation(joinTableName);\n  const query: ParsedFindQuery = {\n    selects: [`\"${alias}\".*`],\n    tables: [{ alias, join: \"primary\", table: joinTableName }],\n    // Or together `where (tag_id = X and book_id = Y)` or `(book_id = B and tag_id = A)`\n    condition: {\n      kind: \"exp\",\n      op: \"or\",\n      conditions: keys.map((key) => {\n        const [one, two] = key.split(\",\");\n        const [columnOne, idOne] = one.split(\"=\");\n        const [columnTwo, idTwo] = two.split(\"=\");\n        // Pick the right meta i.e. tag_id --> TagMeta or book_id --> BookMeta\n        const [meta1, meta2] =\n          collection.columnName === columnOne\n            ? [collection.meta, collection.otherMeta]\n            : [collection.otherMeta, collection.meta];\n        return {\n          kind: \"exp\",\n          op: \"and\",\n          conditions: [\n            {\n              kind: \"column\",\n              alias,\n              column: columnOne,\n              dbType: meta1.idDbType,\n              cond: { kind: \"eq\", value: keyToNumber(meta1, idOne) },\n            },\n            {\n              kind: \"column\",\n              alias,\n              column: columnTwo,\n              dbType: meta2.idDbType,\n              cond: { kind: \"eq\", value: keyToNumber(meta2, idTwo) },\n            },\n          ],\n        };\n      }),\n    },\n    // Id-less join tables have no surrogate id to order by, so order by the FK columns instead.\n    orderBys: collection.hasJoinTableId\n      ? [{ alias, column: \"id\", order: \"ASC\" }]\n      : [\n          { alias, column: collection.columnName, order: \"ASC\" },\n          { alias, column: collection.otherColumnName, order: \"ASC\" },\n        ],\n  };\n\n  const rows = await em[\"executeFind\"](collection.otherMeta, manyToManyFindOperation, query, {});\n\n  const column1 = collection.columnName;\n  const column2 = collection.otherColumnName;\n  const meta1 = collection.meta;\n  const meta2 = collection.otherMeta;\n\n  // Because keys might come from either side of the m2m relationship, build\n  // a list of both `foo_id=2,bar_id=3` and `bar_id=3,foo_id=2` to make the\n  // final return value just a map of `Set.has`.\n  const found = new Set(\n    rows.flatMap((dbRow) => {\n      const a = `${column1}=${tagId(meta1, dbRow[column1] as number)}`;\n      const b = `${column2}=${tagId(meta2, dbRow[column2] as number)}`;\n      return [`${a},${b}`, `${b},${a}`];\n    }),\n  );\n\n  return keys.map((key) => found.has(key));\n}\n"],"mappings":";;;;;;;AAaA,MAAa,0BAA0B;;AAGvC,SAAgB,yBACd,IACA,YAC6B;CAC7B,OAAO,GAAG,UAAU,yBAAyB,WAAW,gBAAgB,SAAS,KAAK,YAAY,IAAI,CAAC;AACzG;AAEA,eAAe,KACb,YACA,MACoB;CACpB,MAAM,EAAE,kBAAkB;CAC1B,MAAM,EAAE,OAAO,WAAW;CAE1B,MAAM,QAAQA,cAAAA,aAAa,aAAa;CACxC,MAAM,QAAyB;EAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;EACxB,QAAQ,CAAC;GAAE;GAAO,MAAM;GAAW,OAAO;EAAc,CAAC;EAEzD,WAAW;GACT,MAAM;GACN,IAAI;GACJ,YAAY,KAAK,KAAK,QAAQ;IAC5B,MAAM,CAAC,KAAK,OAAO,IAAI,MAAM,GAAG;IAChC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;IACxC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;IAExC,MAAM,CAAC,OAAO,SACZ,WAAW,eAAe,YACtB,CAAC,WAAW,MAAM,WAAW,SAAS,IACtC,CAAC,WAAW,WAAW,WAAW,IAAI;IAC5C,OAAO;KACL,MAAM;KACN,IAAI;KACJ,YAAY,CACV;MACE,MAAM;MACN;MACA,QAAQ;MACR,QAAQ,MAAM;MACd,MAAM;OAAE,MAAM;OAAM,OAAOC,aAAAA,YAAY,OAAO,KAAK;MAAE;KACvD,GACA;MACE,MAAM;MACN;MACA,QAAQ;MACR,QAAQ,MAAM;MACd,MAAM;OAAE,MAAM;OAAM,OAAOA,aAAAA,YAAY,OAAO,KAAK;MAAE;KACvD,CACF;IACF;GACF,CAAC;EACH;EAEA,UAAU,WAAW,iBACjB,CAAC;GAAE;GAAO,QAAQ;GAAM,OAAO;EAAM,CAAC,IACtC,CACE;GAAE;GAAO,QAAQ,WAAW;GAAY,OAAO;EAAM,GACrD;GAAE;GAAO,QAAQ,WAAW;GAAiB,OAAO;EAAM,CAC5D;CACN;CAEA,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,WAAW,WAAW,yBAAyB,OAAO,CAAC,CAAC;CAE7F,MAAM,UAAU,WAAW;CAC3B,MAAM,UAAU,WAAW;CAC3B,MAAM,QAAQ,WAAW;CACzB,MAAM,QAAQ,WAAW;CAKzB,MAAM,QAAQ,IAAI,IAChB,KAAK,SAAS,UAAU;EACtB,MAAM,IAAI,GAAG,QAAQ,GAAGC,aAAAA,MAAM,OAAO,MAAM,QAAkB;EAC7D,MAAM,IAAI,GAAG,QAAQ,GAAGA,aAAAA,MAAM,OAAO,MAAM,QAAkB;EAC7D,OAAO,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,GAAG;CAClC,CAAC,CACH;CAEA,OAAO,KAAK,KAAK,QAAQ,MAAM,IAAI,GAAG,CAAC;AACzC"}
+{"version":3,"file":"manyToManyFindDataLoader.cjs","names":["abbreviation","keyToNumber","tagId"],"sources":["../../src/dataloaders/manyToManyFindDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport type { Entity } from \"../Entity.ts\";\nimport type { EntityManager } from \"../EntityManager.ts\";\nimport { keyToNumber, tagId } from \"../keys.ts\";\nimport type { ParsedFindQuery } from \"../queries/find/QueryParser.ts\";\nimport type { ManyToManyCollection } from \"../relations/ManyToManyCollection.ts\";\nimport type { ManyToManyLargeCollection } from \"../relations/ManyToManyLargeCollection.ts\";\nimport { abbreviation } from \"../utils.ts\";\n\nexport const manyToManyFindOperation = \"m2m-find\";\n\n/** Batches m2m.find/include calls (i.e. that don't fully load the m2m relation). */\nexport function manyToManyFindDataLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: ManyToManyCollection<T, U> | ManyToManyLargeCollection<T, U>,\n): DataLoader<string, boolean> {\n  return em.getLoader(manyToManyFindOperation, collection.joinTableName, (keys) => load(collection, keys));\n}\n\nasync function load<T extends Entity, U extends Entity>(\n  collection: ManyToManyCollection<T, U> | ManyToManyLargeCollection<T, U>,\n  keys: ReadonlyArray<string>,\n): Promise<boolean[]> {\n  const { joinTableName } = collection;\n  const { em } = collection.entity;\n\n  const alias = abbreviation(joinTableName);\n  const query: ParsedFindQuery = {\n    selects: [`\"${alias}\".*`],\n    tables: [{ alias, join: \"primary\", table: joinTableName }],\n    // Or together `where (tag_id = X and book_id = Y)` or `(book_id = B and tag_id = A)`\n    condition: {\n      kind: \"exp\",\n      op: \"or\",\n      conditions: keys.map((key) => {\n        const [one, two] = key.split(\",\");\n        const [columnOne, idOne] = one.split(\"=\");\n        const [columnTwo, idTwo] = two.split(\"=\");\n        // Pick the right meta i.e. tag_id --> TagMeta or book_id --> BookMeta\n        const [meta1, meta2] =\n          collection.columnName === columnOne\n            ? [collection.meta, collection.otherMeta]\n            : [collection.otherMeta, collection.meta];\n        return {\n          kind: \"exp\",\n          op: \"and\",\n          conditions: [\n            {\n              kind: \"column\",\n              alias,\n              column: columnOne,\n              dbType: meta1.idDbType,\n              cond: { kind: \"eq\", value: keyToNumber(meta1, idOne) },\n            },\n            {\n              kind: \"column\",\n              alias,\n              column: columnTwo,\n              dbType: meta2.idDbType,\n              cond: { kind: \"eq\", value: keyToNumber(meta2, idTwo) },\n            },\n          ],\n        };\n      }),\n    },\n    // Id-less join tables have no surrogate id to order by, so order by the FK columns instead.\n    orderBys: collection.hasJoinTableId\n      ? [{ alias, column: \"id\", order: \"ASC\" }]\n      : [\n          { alias, column: collection.columnName, order: \"ASC\" },\n          { alias, column: collection.otherColumnName, order: \"ASC\" },\n        ],\n  };\n\n  const rows = await em[\"executeFind\"](collection.otherMeta, manyToManyFindOperation, query, {});\n\n  const column1 = collection.columnName;\n  const column2 = collection.otherColumnName;\n  const meta1 = collection.meta;\n  const meta2 = collection.otherMeta;\n\n  // Because keys might come from either side of the m2m relationship, build\n  // a list of both `foo_id=2,bar_id=3` and `bar_id=3,foo_id=2` to make the\n  // final return value just a map of `Set.has`.\n  const found = new Set(\n    rows.flatMap((dbRow) => {\n      const a = `${column1}=${tagId(meta1, dbRow[column1] as number)}`;\n      const b = `${column2}=${tagId(meta2, dbRow[column2] as number)}`;\n      return [`${a},${b}`, `${b},${a}`];\n    }),\n  );\n\n  return keys.map((key) => found.has(key));\n}\n"],"mappings":";;;;AAUA,MAAa,0BAA0B;;AAGvC,SAAgB,yBACd,IACA,YAC6B;CAC7B,OAAO,GAAG,UAAU,yBAAyB,WAAW,gBAAgB,SAAS,KAAK,YAAY,IAAI,CAAC;AACzG;AAEA,eAAe,KACb,YACA,MACoB;CACpB,MAAM,EAAE,kBAAkB;CAC1B,MAAM,EAAE,OAAO,WAAW;CAE1B,MAAM,QAAQA,cAAAA,aAAa,aAAa;CACxC,MAAM,QAAyB;EAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;EACxB,QAAQ,CAAC;GAAE;GAAO,MAAM;GAAW,OAAO;EAAc,CAAC;EAEzD,WAAW;GACT,MAAM;GACN,IAAI;GACJ,YAAY,KAAK,KAAK,QAAQ;IAC5B,MAAM,CAAC,KAAK,OAAO,IAAI,MAAM,GAAG;IAChC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;IACxC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;IAExC,MAAM,CAAC,OAAO,SACZ,WAAW,eAAe,YACtB,CAAC,WAAW,MAAM,WAAW,SAAS,IACtC,CAAC,WAAW,WAAW,WAAW,IAAI;IAC5C,OAAO;KACL,MAAM;KACN,IAAI;KACJ,YAAY,CACV;MACE,MAAM;MACN;MACA,QAAQ;MACR,QAAQ,MAAM;MACd,MAAM;OAAE,MAAM;OAAM,OAAOC,aAAAA,YAAY,OAAO,KAAK;MAAE;KACvD,GACA;MACE,MAAM;MACN;MACA,QAAQ;MACR,QAAQ,MAAM;MACd,MAAM;OAAE,MAAM;OAAM,OAAOA,aAAAA,YAAY,OAAO,KAAK;MAAE;KACvD,CACF;IACF;GACF,CAAC;EACH;EAEA,UAAU,WAAW,iBACjB,CAAC;GAAE;GAAO,QAAQ;GAAM,OAAO;EAAM,CAAC,IACtC,CACE;GAAE;GAAO,QAAQ,WAAW;GAAY,OAAO;EAAM,GACrD;GAAE;GAAO,QAAQ,WAAW;GAAiB,OAAO;EAAM,CAC5D;CACN;CAEA,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,WAAW,WAAW,yBAAyB,OAAO,CAAC,CAAC;CAE7F,MAAM,UAAU,WAAW;CAC3B,MAAM,UAAU,WAAW;CAC3B,MAAM,QAAQ,WAAW;CACzB,MAAM,QAAQ,WAAW;CAKzB,MAAM,QAAQ,IAAI,IAChB,KAAK,SAAS,UAAU;EACtB,MAAM,IAAI,GAAG,QAAQ,GAAGC,aAAAA,MAAM,OAAO,MAAM,QAAkB;EAC7D,MAAM,IAAI,GAAG,QAAQ,GAAGA,aAAAA,MAAM,OAAO,MAAM,QAAkB;EAC7D,OAAO,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,GAAG;CAClC,CAAC,CACH;CAEA,OAAO,KAAK,KAAK,QAAQ,MAAM,IAAI,GAAG,CAAC;AACzC"}

package/build/dataloaders/manyToManyFindDataLoader.d.cts

@@ -1,6 +1,5 @@
 import { ManyToManyCollection } from "../relations/ManyToManyCollection.cjs";
 import { ManyToManyLargeCollection } from "../relations/ManyToManyLargeCollection.cjs";
-import "../index.cjs";
 import { EntityManager } from "../EntityManager.cjs";
 import { Entity } from "../Entity.cjs";
 import DataLoader from "dataloader";

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

@@ -1 +1 @@
-{"version":3,"file":"manyToManyFindDataLoader.d.cts","names":[],"sources":["../../src/dataloaders/manyToManyFindDataLoader.ts"],"mappings":";;;;;;;cAaa;;iBAGG,yBAAyB,UAAU,QAAQ,UAAU,QACnE,IAAI,eACJ,YAAY,qBAAqB,GAAG,KAAK,0BAA0B,GAAG,KACrE"}
+{"version":3,"file":"manyToManyFindDataLoader.d.cts","names":[],"sources":["../../src/dataloaders/manyToManyFindDataLoader.ts"],"mappings":";;;;;;cAUa;;iBAGG,yBAAyB,UAAU,QAAQ,UAAU,QACnE,IAAI,eACJ,YAAY,qBAAqB,GAAG,KAAK,0BAA0B,GAAG,KACrE"}

package/build/dataloaders/manyToManyFindDataLoader.d.mts

@@ -1,6 +1,5 @@
 import { ManyToManyCollection } from "../relations/ManyToManyCollection.mjs";
 import { ManyToManyLargeCollection } from "../relations/ManyToManyLargeCollection.mjs";
-import "../index.mjs";
 import { EntityManager } from "../EntityManager.mjs";
 import { Entity } from "../Entity.mjs";
 import DataLoader from "dataloader";

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

@@ -1 +1 @@
-{"version":3,"file":"manyToManyFindDataLoader.d.mts","names":[],"sources":["../../src/dataloaders/manyToManyFindDataLoader.ts"],"mappings":";;;;;;;cAaa;;iBAGG,yBAAyB,UAAU,QAAQ,UAAU,QACnE,IAAI,eACJ,YAAY,qBAAqB,GAAG,KAAK,0BAA0B,GAAG,KACrE"}
+{"version":3,"file":"manyToManyFindDataLoader.d.mts","names":[],"sources":["../../src/dataloaders/manyToManyFindDataLoader.ts"],"mappings":";;;;;;cAUa;;iBAGG,yBAAyB,UAAU,QAAQ,UAAU,QACnE,IAAI,eACJ,YAAY,qBAAqB,GAAG,KAAK,0BAA0B,GAAG,KACrE"}

package/build/dataloaders/manyToManyFindDataLoader.js

@@ -1,8 +1,5 @@
-import { keyToNumber, tagId } from "../keys.js";
 import { abbreviation } from "../utils.js";
-import "../index.js";
-import "../EntityManager.js";
-import "../Entity.js";
+import { keyToNumber, tagId } from "../keys.js";
 //#region src/dataloaders/manyToManyFindDataLoader.ts
 const manyToManyFindOperation = "m2m-find";
 /** Batches m2m.find/include calls (i.e. that don't fully load the m2m relation). */

package/build/dataloaders/manyToManyFindDataLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"manyToManyFindDataLoader.js","names":[],"sources":["../../src/dataloaders/manyToManyFindDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager } from \"../EntityManager.ts\";\nimport {\n  type ManyToManyCollection,\n  type ManyToManyLargeCollection,\n  type ParsedFindQuery,\n  keyToNumber,\n  tagId,\n} from \"../index.ts\";\nimport { abbreviation } from \"../utils.ts\";\n\nexport const manyToManyFindOperation = \"m2m-find\";\n\n/** Batches m2m.find/include calls (i.e. that don't fully load the m2m relation). */\nexport function manyToManyFindDataLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: ManyToManyCollection<T, U> | ManyToManyLargeCollection<T, U>,\n): DataLoader<string, boolean> {\n  return em.getLoader(manyToManyFindOperation, collection.joinTableName, (keys) => load(collection, keys));\n}\n\nasync function load<T extends Entity, U extends Entity>(\n  collection: ManyToManyCollection<T, U> | ManyToManyLargeCollection<T, U>,\n  keys: ReadonlyArray<string>,\n): Promise<boolean[]> {\n  const { joinTableName } = collection;\n  const { em } = collection.entity;\n\n  const alias = abbreviation(joinTableName);\n  const query: ParsedFindQuery = {\n    selects: [`\"${alias}\".*`],\n    tables: [{ alias, join: \"primary\", table: joinTableName }],\n    // Or together `where (tag_id = X and book_id = Y)` or `(book_id = B and tag_id = A)`\n    condition: {\n      kind: \"exp\",\n      op: \"or\",\n      conditions: keys.map((key) => {\n        const [one, two] = key.split(\",\");\n        const [columnOne, idOne] = one.split(\"=\");\n        const [columnTwo, idTwo] = two.split(\"=\");\n        // Pick the right meta i.e. tag_id --> TagMeta or book_id --> BookMeta\n        const [meta1, meta2] =\n          collection.columnName === columnOne\n            ? [collection.meta, collection.otherMeta]\n            : [collection.otherMeta, collection.meta];\n        return {\n          kind: \"exp\",\n          op: \"and\",\n          conditions: [\n            {\n              kind: \"column\",\n              alias,\n              column: columnOne,\n              dbType: meta1.idDbType,\n              cond: { kind: \"eq\", value: keyToNumber(meta1, idOne) },\n            },\n            {\n              kind: \"column\",\n              alias,\n              column: columnTwo,\n              dbType: meta2.idDbType,\n              cond: { kind: \"eq\", value: keyToNumber(meta2, idTwo) },\n            },\n          ],\n        };\n      }),\n    },\n    // Id-less join tables have no surrogate id to order by, so order by the FK columns instead.\n    orderBys: collection.hasJoinTableId\n      ? [{ alias, column: \"id\", order: \"ASC\" }]\n      : [\n          { alias, column: collection.columnName, order: \"ASC\" },\n          { alias, column: collection.otherColumnName, order: \"ASC\" },\n        ],\n  };\n\n  const rows = await em[\"executeFind\"](collection.otherMeta, manyToManyFindOperation, query, {});\n\n  const column1 = collection.columnName;\n  const column2 = collection.otherColumnName;\n  const meta1 = collection.meta;\n  const meta2 = collection.otherMeta;\n\n  // Because keys might come from either side of the m2m relationship, build\n  // a list of both `foo_id=2,bar_id=3` and `bar_id=3,foo_id=2` to make the\n  // final return value just a map of `Set.has`.\n  const found = new Set(\n    rows.flatMap((dbRow) => {\n      const a = `${column1}=${tagId(meta1, dbRow[column1] as number)}`;\n      const b = `${column2}=${tagId(meta2, dbRow[column2] as number)}`;\n      return [`${a},${b}`, `${b},${a}`];\n    }),\n  );\n\n  return keys.map((key) => found.has(key));\n}\n"],"mappings":";;;;;;AAaA,MAAa,0BAA0B;;AAGvC,SAAgB,yBACd,IACA,YAC6B;CAC7B,OAAO,GAAG,UAAU,yBAAyB,WAAW,gBAAgB,SAAS,KAAK,YAAY,IAAI,CAAC;AACzG;AAEA,eAAe,KACb,YACA,MACoB;CACpB,MAAM,EAAE,kBAAkB;CAC1B,MAAM,EAAE,OAAO,WAAW;CAE1B,MAAM,QAAQ,aAAa,aAAa;CACxC,MAAM,QAAyB;EAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;EACxB,QAAQ,CAAC;GAAE;GAAO,MAAM;GAAW,OAAO;EAAc,CAAC;EAEzD,WAAW;GACT,MAAM;GACN,IAAI;GACJ,YAAY,KAAK,KAAK,QAAQ;IAC5B,MAAM,CAAC,KAAK,OAAO,IAAI,MAAM,GAAG;IAChC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;IACxC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;IAExC,MAAM,CAAC,OAAO,SACZ,WAAW,eAAe,YACtB,CAAC,WAAW,MAAM,WAAW,SAAS,IACtC,CAAC,WAAW,WAAW,WAAW,IAAI;IAC5C,OAAO;KACL,MAAM;KACN,IAAI;KACJ,YAAY,CACV;MACE,MAAM;MACN;MACA,QAAQ;MACR,QAAQ,MAAM;MACd,MAAM;OAAE,MAAM;OAAM,OAAO,YAAY,OAAO,KAAK;MAAE;KACvD,GACA;MACE,MAAM;MACN;MACA,QAAQ;MACR,QAAQ,MAAM;MACd,MAAM;OAAE,MAAM;OAAM,OAAO,YAAY,OAAO,KAAK;MAAE;KACvD,CACF;IACF;GACF,CAAC;EACH;EAEA,UAAU,WAAW,iBACjB,CAAC;GAAE;GAAO,QAAQ;GAAM,OAAO;EAAM,CAAC,IACtC,CACE;GAAE;GAAO,QAAQ,WAAW;GAAY,OAAO;EAAM,GACrD;GAAE;GAAO,QAAQ,WAAW;GAAiB,OAAO;EAAM,CAC5D;CACN;CAEA,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,WAAW,WAAW,yBAAyB,OAAO,CAAC,CAAC;CAE7F,MAAM,UAAU,WAAW;CAC3B,MAAM,UAAU,WAAW;CAC3B,MAAM,QAAQ,WAAW;CACzB,MAAM,QAAQ,WAAW;CAKzB,MAAM,QAAQ,IAAI,IAChB,KAAK,SAAS,UAAU;EACtB,MAAM,IAAI,GAAG,QAAQ,GAAG,MAAM,OAAO,MAAM,QAAkB;EAC7D,MAAM,IAAI,GAAG,QAAQ,GAAG,MAAM,OAAO,MAAM,QAAkB;EAC7D,OAAO,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,GAAG;CAClC,CAAC,CACH;CAEA,OAAO,KAAK,KAAK,QAAQ,MAAM,IAAI,GAAG,CAAC;AACzC"}
+{"version":3,"file":"manyToManyFindDataLoader.js","names":[],"sources":["../../src/dataloaders/manyToManyFindDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport type { Entity } from \"../Entity.ts\";\nimport type { EntityManager } from \"../EntityManager.ts\";\nimport { keyToNumber, tagId } from \"../keys.ts\";\nimport type { ParsedFindQuery } from \"../queries/find/QueryParser.ts\";\nimport type { ManyToManyCollection } from \"../relations/ManyToManyCollection.ts\";\nimport type { ManyToManyLargeCollection } from \"../relations/ManyToManyLargeCollection.ts\";\nimport { abbreviation } from \"../utils.ts\";\n\nexport const manyToManyFindOperation = \"m2m-find\";\n\n/** Batches m2m.find/include calls (i.e. that don't fully load the m2m relation). */\nexport function manyToManyFindDataLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: ManyToManyCollection<T, U> | ManyToManyLargeCollection<T, U>,\n): DataLoader<string, boolean> {\n  return em.getLoader(manyToManyFindOperation, collection.joinTableName, (keys) => load(collection, keys));\n}\n\nasync function load<T extends Entity, U extends Entity>(\n  collection: ManyToManyCollection<T, U> | ManyToManyLargeCollection<T, U>,\n  keys: ReadonlyArray<string>,\n): Promise<boolean[]> {\n  const { joinTableName } = collection;\n  const { em } = collection.entity;\n\n  const alias = abbreviation(joinTableName);\n  const query: ParsedFindQuery = {\n    selects: [`\"${alias}\".*`],\n    tables: [{ alias, join: \"primary\", table: joinTableName }],\n    // Or together `where (tag_id = X and book_id = Y)` or `(book_id = B and tag_id = A)`\n    condition: {\n      kind: \"exp\",\n      op: \"or\",\n      conditions: keys.map((key) => {\n        const [one, two] = key.split(\",\");\n        const [columnOne, idOne] = one.split(\"=\");\n        const [columnTwo, idTwo] = two.split(\"=\");\n        // Pick the right meta i.e. tag_id --> TagMeta or book_id --> BookMeta\n        const [meta1, meta2] =\n          collection.columnName === columnOne\n            ? [collection.meta, collection.otherMeta]\n            : [collection.otherMeta, collection.meta];\n        return {\n          kind: \"exp\",\n          op: \"and\",\n          conditions: [\n            {\n              kind: \"column\",\n              alias,\n              column: columnOne,\n              dbType: meta1.idDbType,\n              cond: { kind: \"eq\", value: keyToNumber(meta1, idOne) },\n            },\n            {\n              kind: \"column\",\n              alias,\n              column: columnTwo,\n              dbType: meta2.idDbType,\n              cond: { kind: \"eq\", value: keyToNumber(meta2, idTwo) },\n            },\n          ],\n        };\n      }),\n    },\n    // Id-less join tables have no surrogate id to order by, so order by the FK columns instead.\n    orderBys: collection.hasJoinTableId\n      ? [{ alias, column: \"id\", order: \"ASC\" }]\n      : [\n          { alias, column: collection.columnName, order: \"ASC\" },\n          { alias, column: collection.otherColumnName, order: \"ASC\" },\n        ],\n  };\n\n  const rows = await em[\"executeFind\"](collection.otherMeta, manyToManyFindOperation, query, {});\n\n  const column1 = collection.columnName;\n  const column2 = collection.otherColumnName;\n  const meta1 = collection.meta;\n  const meta2 = collection.otherMeta;\n\n  // Because keys might come from either side of the m2m relationship, build\n  // a list of both `foo_id=2,bar_id=3` and `bar_id=3,foo_id=2` to make the\n  // final return value just a map of `Set.has`.\n  const found = new Set(\n    rows.flatMap((dbRow) => {\n      const a = `${column1}=${tagId(meta1, dbRow[column1] as number)}`;\n      const b = `${column2}=${tagId(meta2, dbRow[column2] as number)}`;\n      return [`${a},${b}`, `${b},${a}`];\n    }),\n  );\n\n  return keys.map((key) => found.has(key));\n}\n"],"mappings":";;;AAUA,MAAa,0BAA0B;;AAGvC,SAAgB,yBACd,IACA,YAC6B;CAC7B,OAAO,GAAG,UAAU,yBAAyB,WAAW,gBAAgB,SAAS,KAAK,YAAY,IAAI,CAAC;AACzG;AAEA,eAAe,KACb,YACA,MACoB;CACpB,MAAM,EAAE,kBAAkB;CAC1B,MAAM,EAAE,OAAO,WAAW;CAE1B,MAAM,QAAQ,aAAa,aAAa;CACxC,MAAM,QAAyB;EAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;EACxB,QAAQ,CAAC;GAAE;GAAO,MAAM;GAAW,OAAO;EAAc,CAAC;EAEzD,WAAW;GACT,MAAM;GACN,IAAI;GACJ,YAAY,KAAK,KAAK,QAAQ;IAC5B,MAAM,CAAC,KAAK,OAAO,IAAI,MAAM,GAAG;IAChC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;IACxC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;IAExC,MAAM,CAAC,OAAO,SACZ,WAAW,eAAe,YACtB,CAAC,WAAW,MAAM,WAAW,SAAS,IACtC,CAAC,WAAW,WAAW,WAAW,IAAI;IAC5C,OAAO;KACL,MAAM;KACN,IAAI;KACJ,YAAY,CACV;MACE,MAAM;MACN;MACA,QAAQ;MACR,QAAQ,MAAM;MACd,MAAM;OAAE,MAAM;OAAM,OAAO,YAAY,OAAO,KAAK;MAAE;KACvD,GACA;MACE,MAAM;MACN;MACA,QAAQ;MACR,QAAQ,MAAM;MACd,MAAM;OAAE,MAAM;OAAM,OAAO,YAAY,OAAO,KAAK;MAAE;KACvD,CACF;IACF;GACF,CAAC;EACH;EAEA,UAAU,WAAW,iBACjB,CAAC;GAAE;GAAO,QAAQ;GAAM,OAAO;EAAM,CAAC,IACtC,CACE;GAAE;GAAO,QAAQ,WAAW;GAAY,OAAO;EAAM,GACrD;GAAE;GAAO,QAAQ,WAAW;GAAiB,OAAO;EAAM,CAC5D;CACN;CAEA,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,WAAW,WAAW,yBAAyB,OAAO,CAAC,CAAC;CAE7F,MAAM,UAAU,WAAW;CAC3B,MAAM,UAAU,WAAW;CAC3B,MAAM,QAAQ,WAAW;CACzB,MAAM,QAAQ,WAAW;CAKzB,MAAM,QAAQ,IAAI,IAChB,KAAK,SAAS,UAAU;EACtB,MAAM,IAAI,GAAG,QAAQ,GAAG,MAAM,OAAO,MAAM,QAAkB;EAC7D,MAAM,IAAI,GAAG,QAAQ,GAAG,MAAM,OAAO,MAAM,QAAkB;EAC7D,OAAO,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,GAAG;CAClC,CAAC,CACH;CAEA,OAAO,KAAK,KAAK,QAAQ,MAAM,IAAI,GAAG,CAAC;AACzC"}

package/build/dataloaders/oneToManyFindDataLoader.cjs

@@ -1,10 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_keys = require("../keys.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
 const require_utils = require("../utils.cjs");
-require("../index.cjs");
-require("../EntityManager.cjs");
-require("../Entity.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
+const require_keys = require("../keys.cjs");
 //#region src/dataloaders/oneToManyFindDataLoader.ts
 const oneToManyFindOperation = "o2m-find";
 /** Batches o2m.find/include calls (i.e. that don't fully load the o2m relation). */
@@ -61,7 +58,7 @@ function oneToManyFindDataLoader(em, collection) {
 				order: "ASC"
 			}]
 		};
-		require_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
+		require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
 		const rows = await em["executeFind"](collection.otherMeta, oneToManyFindOperation, query, {});
 		em.hydrate(collection.otherMeta.cstr, rows);
 		return keys.map((k) => {

package/build/dataloaders/oneToManyFindDataLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"oneToManyFindDataLoader.cjs","names":["abbreviation","keyToNumber"],"sources":["../../src/dataloaders/oneToManyFindDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager } from \"../EntityManager.ts\";\nimport {\n  type OneToManyCollection,\n  type OneToManyLargeCollection,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  keyToNumber,\n} from \"../index.ts\";\nimport { abbreviation } from \"../utils.ts\";\n\nexport const oneToManyFindOperation = \"o2m-find\";\n\n/** Batches o2m.find/include calls (i.e. that don't fully load the o2m relation). */\nexport function oneToManyFindDataLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: OneToManyCollection<T, U> | OneToManyLargeCollection<T, U>,\n): DataLoader<string, U | undefined> {\n  const { meta } = collection;\n  const batchKey = `${meta.tableName}-${collection.fieldName}`;\n  return em.getLoader(oneToManyFindOperation, batchKey, async (keys) => {\n    const { em } = collection.entity;\n\n    const meta = collection.otherMeta;\n    const alias = abbreviation(meta.tableName);\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      // Or together `where (id = X and book_id = Y)`\n      condition: {\n        kind: \"exp\",\n        op: \"or\",\n        conditions: keys.map((key) => {\n          const [one, two] = key.split(\",\");\n          // columnOne is the `id=`, so is really the \"other\" side of the o2m\n          const [columnOne, idOne] = one.split(\"=\");\n          const [columnTwo, idTwo] = two.split(\"=\");\n          const [meta1, meta2] = [collection.otherMeta, collection.meta];\n          // Pick the right meta i.e. tag_id --> TagMeta or book_id --> BookMeta\n          return {\n            kind: \"exp\",\n            op: \"and\",\n            conditions: [\n              {\n                kind: \"column\",\n                alias,\n                column: columnOne,\n                dbType: meta1.idDbType,\n                cond: { kind: \"eq\", value: keyToNumber(meta1, idOne) },\n              },\n              {\n                kind: \"column\",\n                alias,\n                column: columnTwo,\n                dbType: meta2.idDbType,\n                cond: { kind: \"eq\", value: keyToNumber(meta2, idTwo) },\n              },\n            ],\n          };\n        }),\n      },\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n    // Skip maybeAddOrderBy b/c we're only returning 1 result\n    // maybeAddNotSoftDeleted(conditions, meta, alias, \"include\");\n\n    const rows = await em[\"executeFind\"](collection.otherMeta, oneToManyFindOperation, query, {});\n    em.hydrate(collection.otherMeta.cstr, rows);\n\n    // Decode `id=b:1,author_id=a:1`\n    return keys.map((k) => {\n      const [otherKey, parentKey] = k.split(\",\");\n      const [, otherId] = otherKey.split(\"=\");\n      const [, parentId] = parentKey.split(\"=\");\n      const other = em.getEntity(otherId) as U;\n      // We have may fetched `other` for a different parent in our batch\n      const isMine = (other as any)?.[collection.otherFieldName].id === parentId;\n      return isMine ? other : undefined;\n    });\n  });\n}\n"],"mappings":";;;;;;;;AAaA,MAAa,yBAAyB;;AAGtC,SAAgB,wBACd,IACA,YACmC;CACnC,MAAM,EAAE,SAAS;CACjB,MAAM,WAAW,GAAG,KAAK,UAAU,GAAG,WAAW;CACjD,OAAO,GAAG,UAAU,wBAAwB,UAAU,OAAO,SAAS;EACpE,MAAM,EAAE,OAAO,WAAW;EAE1B,MAAM,OAAO,WAAW;EACxB,MAAM,QAAQA,cAAAA,aAAa,KAAK,SAAS;EACzC,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAE1D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,KAAK,KAAK,QAAQ;KAC5B,MAAM,CAAC,KAAK,OAAO,IAAI,MAAM,GAAG;KAEhC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;KACxC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;KACxC,MAAM,CAAC,OAAO,SAAS,CAAC,WAAW,WAAW,WAAW,IAAI;KAE7D,OAAO;MACL,MAAM;MACN,IAAI;MACJ,YAAY,CACV;OACE,MAAM;OACN;OACA,QAAQ;OACR,QAAQ,MAAM;OACd,MAAM;QAAE,MAAM;QAAM,OAAOC,aAAAA,YAAY,OAAO,KAAK;OAAE;MACvD,GACA;OACE,MAAM;OACN;OACA,QAAQ;OACR,QAAQ,MAAM;OACd,MAAM;QAAE,MAAM;QAAM,OAAOA,aAAAA,YAAY,OAAO,KAAK;OAAE;MACvD,CACF;KACF;IACF,CAAC;GACH;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;EAClD;EAEA,oBAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAIzD,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,WAAW,WAAW,wBAAwB,OAAO,CAAC,CAAC;EAC5F,GAAG,QAAQ,WAAW,UAAU,MAAM,IAAI;EAG1C,OAAO,KAAK,KAAK,MAAM;GACrB,MAAM,CAAC,UAAU,aAAa,EAAE,MAAM,GAAG;GACzC,MAAM,GAAG,WAAW,SAAS,MAAM,GAAG;GACtC,MAAM,GAAG,YAAY,UAAU,MAAM,GAAG;GACxC,MAAM,QAAQ,GAAG,UAAU,OAAO;GAGlC,OADgB,QAAgB,WAAW,eAAe,CAAC,OAAO,WAClD,QAAQ,KAAA;EAC1B,CAAC;CACH,CAAC;AACH"}
+{"version":3,"file":"oneToManyFindDataLoader.cjs","names":["abbreviation","keyToNumber"],"sources":["../../src/dataloaders/oneToManyFindDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport type { Entity } from \"../Entity.ts\";\nimport type { EntityManager } from \"../EntityManager.ts\";\nimport { keyToNumber } from \"../keys.ts\";\nimport { type ParsedFindQuery, addTablePerClassJoinsAndClassTag } from \"../queries/find/QueryParser.ts\";\nimport type { OneToManyCollection } from \"../relations/OneToManyCollection.ts\";\nimport type { OneToManyLargeCollection } from \"../relations/OneToManyLargeCollection.ts\";\nimport { abbreviation } from \"../utils.ts\";\n\nexport const oneToManyFindOperation = \"o2m-find\";\n\n/** Batches o2m.find/include calls (i.e. that don't fully load the o2m relation). */\nexport function oneToManyFindDataLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: OneToManyCollection<T, U> | OneToManyLargeCollection<T, U>,\n): DataLoader<string, U | undefined> {\n  const { meta } = collection;\n  const batchKey = `${meta.tableName}-${collection.fieldName}`;\n  return em.getLoader(oneToManyFindOperation, batchKey, async (keys) => {\n    const { em } = collection.entity;\n\n    const meta = collection.otherMeta;\n    const alias = abbreviation(meta.tableName);\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      // Or together `where (id = X and book_id = Y)`\n      condition: {\n        kind: \"exp\",\n        op: \"or\",\n        conditions: keys.map((key) => {\n          const [one, two] = key.split(\",\");\n          // columnOne is the `id=`, so is really the \"other\" side of the o2m\n          const [columnOne, idOne] = one.split(\"=\");\n          const [columnTwo, idTwo] = two.split(\"=\");\n          const [meta1, meta2] = [collection.otherMeta, collection.meta];\n          // Pick the right meta i.e. tag_id --> TagMeta or book_id --> BookMeta\n          return {\n            kind: \"exp\",\n            op: \"and\",\n            conditions: [\n              {\n                kind: \"column\",\n                alias,\n                column: columnOne,\n                dbType: meta1.idDbType,\n                cond: { kind: \"eq\", value: keyToNumber(meta1, idOne) },\n              },\n              {\n                kind: \"column\",\n                alias,\n                column: columnTwo,\n                dbType: meta2.idDbType,\n                cond: { kind: \"eq\", value: keyToNumber(meta2, idTwo) },\n              },\n            ],\n          };\n        }),\n      },\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n    // Skip maybeAddOrderBy b/c we're only returning 1 result\n    // maybeAddNotSoftDeleted(conditions, meta, alias, \"include\");\n\n    const rows = await em[\"executeFind\"](collection.otherMeta, oneToManyFindOperation, query, {});\n    em.hydrate(collection.otherMeta.cstr, rows);\n\n    // Decode `id=b:1,author_id=a:1`\n    return keys.map((k) => {\n      const [otherKey, parentKey] = k.split(\",\");\n      const [, otherId] = otherKey.split(\"=\");\n      const [, parentId] = parentKey.split(\"=\");\n      const other = em.getEntity(otherId) as U;\n      // We have may fetched `other` for a different parent in our batch\n      const isMine = (other as any)?.[collection.otherFieldName].id === parentId;\n      return isMine ? other : undefined;\n    });\n  });\n}\n"],"mappings":";;;;;AAUA,MAAa,yBAAyB;;AAGtC,SAAgB,wBACd,IACA,YACmC;CACnC,MAAM,EAAE,SAAS;CACjB,MAAM,WAAW,GAAG,KAAK,UAAU,GAAG,WAAW;CACjD,OAAO,GAAG,UAAU,wBAAwB,UAAU,OAAO,SAAS;EACpE,MAAM,EAAE,OAAO,WAAW;EAE1B,MAAM,OAAO,WAAW;EACxB,MAAM,QAAQA,cAAAA,aAAa,KAAK,SAAS;EACzC,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAE1D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,KAAK,KAAK,QAAQ;KAC5B,MAAM,CAAC,KAAK,OAAO,IAAI,MAAM,GAAG;KAEhC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;KACxC,MAAM,CAAC,WAAW,SAAS,IAAI,MAAM,GAAG;KACxC,MAAM,CAAC,OAAO,SAAS,CAAC,WAAW,WAAW,WAAW,IAAI;KAE7D,OAAO;MACL,MAAM;MACN,IAAI;MACJ,YAAY,CACV;OACE,MAAM;OACN;OACA,QAAQ;OACR,QAAQ,MAAM;OACd,MAAM;QAAE,MAAM;QAAM,OAAOC,aAAAA,YAAY,OAAO,KAAK;OAAE;MACvD,GACA;OACE,MAAM;OACN;OACA,QAAQ;OACR,QAAQ,MAAM;OACd,MAAM;QAAE,MAAM;QAAM,OAAOA,aAAAA,YAAY,OAAO,KAAK;OAAE;MACvD,CACF;KACF;IACF,CAAC;GACH;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;EAClD;EAEA,iCAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAIzD,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,WAAW,WAAW,wBAAwB,OAAO,CAAC,CAAC;EAC5F,GAAG,QAAQ,WAAW,UAAU,MAAM,IAAI;EAG1C,OAAO,KAAK,KAAK,MAAM;GACrB,MAAM,CAAC,UAAU,aAAa,EAAE,MAAM,GAAG;GACzC,MAAM,GAAG,WAAW,SAAS,MAAM,GAAG;GACtC,MAAM,GAAG,YAAY,UAAU,MAAM,GAAG;GACxC,MAAM,QAAQ,GAAG,UAAU,OAAO;GAGlC,OADgB,QAAgB,WAAW,eAAe,CAAC,OAAO,WAClD,QAAQ,KAAA;EAC1B,CAAC;CACH,CAAC;AACH"}

package/build/dataloaders/oneToManyFindDataLoader.d.cts

@@ -1,6 +1,5 @@
 import { OneToManyCollection } from "../relations/OneToManyCollection.cjs";
 import { OneToManyLargeCollection } from "../relations/OneToManyLargeCollection.cjs";
-import "../index.cjs";
 import { EntityManager } from "../EntityManager.cjs";
 import { Entity } from "../Entity.cjs";
 import DataLoader from "dataloader";

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

@@ -1 +1 @@
-{"version":3,"file":"oneToManyFindDataLoader.d.cts","names":[],"sources":["../../src/dataloaders/oneToManyFindDataLoader.ts"],"mappings":";;;;;;;cAaa;;iBAGG,wBAAwB,UAAU,QAAQ,UAAU,QAClE,IAAI,eACJ,YAAY,oBAAoB,GAAG,KAAK,yBAAyB,GAAG,KACnE,mBAAmB"}
+{"version":3,"file":"oneToManyFindDataLoader.d.cts","names":[],"sources":["../../src/dataloaders/oneToManyFindDataLoader.ts"],"mappings":";;;;;;cAUa;;iBAGG,wBAAwB,UAAU,QAAQ,UAAU,QAClE,IAAI,eACJ,YAAY,oBAAoB,GAAG,KAAK,yBAAyB,GAAG,KACnE,mBAAmB"}

package/build/dataloaders/oneToManyFindDataLoader.d.mts

@@ -1,6 +1,5 @@
 import { OneToManyCollection } from "../relations/OneToManyCollection.mjs";
 import { OneToManyLargeCollection } from "../relations/OneToManyLargeCollection.mjs";
-import "../index.mjs";
 import { EntityManager } from "../EntityManager.mjs";
 import { Entity } from "../Entity.mjs";
 import DataLoader from "dataloader";

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

@@ -1 +1 @@
-{"version":3,"file":"oneToManyFindDataLoader.d.mts","names":[],"sources":["../../src/dataloaders/oneToManyFindDataLoader.ts"],"mappings":";;;;;;;cAaa;;iBAGG,wBAAwB,UAAU,QAAQ,UAAU,QAClE,IAAI,eACJ,YAAY,oBAAoB,GAAG,KAAK,yBAAyB,GAAG,KACnE,mBAAmB"}
+{"version":3,"file":"oneToManyFindDataLoader.d.mts","names":[],"sources":["../../src/dataloaders/oneToManyFindDataLoader.ts"],"mappings":";;;;;;cAUa;;iBAGG,wBAAwB,UAAU,QAAQ,UAAU,QAClE,IAAI,eACJ,YAAY,oBAAoB,GAAG,KAAK,yBAAyB,GAAG,KACnE,mBAAmB"}

package/build/dataloaders/oneToManyFindDataLoader.js

@@ -1,9 +1,6 @@
-import { keyToNumber } from "../keys.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
 import { abbreviation } from "../utils.js";
-import "../index.js";
-import "../EntityManager.js";
-import "../Entity.js";
-import { addTablePerClassJoinsAndClassTag } from "../QueryParser.js";
+import { keyToNumber } from "../keys.js";
 //#region src/dataloaders/oneToManyFindDataLoader.ts
 const oneToManyFindOperation = "o2m-find";
 /** Batches o2m.find/include calls (i.e. that don't fully load the o2m relation). */