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

package/build/batchloaders/populateBatchLoader.cjs

@@ -1,23 +1,23 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./BatchLoader.cjs");
-const require_keywords = require("../keywords.cjs");
-const require_batchloaders_manyToManyBatchLoader = require("./manyToManyBatchLoader.cjs");
-const require_batchloaders_oneToManyBatchLoader = require("./oneToManyBatchLoader.cjs");
+const require_queries_sql_keywords = require("../queries/sql/keywords.cjs");
 const require_batchloaders_oneToOneBatchLoader = require("./oneToOneBatchLoader.cjs");
-const require_relations_ReactiveField = require("../relations/ReactiveField.cjs");
-const require_keys = require("../keys.cjs");
-require("../EntityMetadata.cjs");
+const require_batchloaders_oneToManyBatchLoader = require("./oneToManyBatchLoader.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
 const require_reactiveHints = require("../reactiveHints.cjs");
 const require_normalizeHints = require("../normalizeHints.cjs");
 require("../loadHints.cjs");
 const require_utils = require("../utils.cjs");
+const require_batchloaders_manyToManyBatchLoader = require("./manyToManyBatchLoader.cjs");
+const require_relations_ReactiveField = require("../relations/ReactiveField.cjs");
+const require_keys = require("../keys.cjs");
+require("../EntityMetadata.cjs");
+const require_queries_sql_AliasAssigner = require("../queries/sql/AliasAssigner.cjs");
 const require_HintTree = require("../HintTree.cjs");
 require("../index.cjs");
 const require_batchloaders_loadBatchLoader = require("./loadBatchLoader.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
 require("../Entity.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
-const require_AliasAssigner = require("../AliasAssigner.cjs");
 //#region src/batchloaders/populateBatchLoader.ts
 const populateOperation = "populate";
 function populateBatchLoader(em, meta, hint, mode, opts = {}) {
@@ -30,13 +30,13 @@ function populateBatchLoader(em, meta, hint, mode, opts = {}) {
 					for (const entity of hint.entities) if (entity[key]?.isLoaded === false && !entity[key]?.isPreloaded) return true;
 					return false;
 				})) {
-					const assigner = new require_AliasAssigner.AliasAssigner();
+					const assigner = new require_queries_sql_AliasAssigner.AliasAssigner();
 					const meta = layerMeta;
 					const alias = assigner.getAlias(meta.tableName);
 					const entities = [...layerNode.entities].filter((e) => !e.isNewEntity);
 					const ids = entities.map((e) => require_keys.keyToNumber(meta, e.id));
 					const query = {
-						selects: [require_keywords.kqDot(alias, "id")],
+						selects: [require_queries_sql_keywords.kqDot(alias, "id")],
 						tables: [{
 							alias,
 							join: "primary",
@@ -58,7 +58,7 @@ function populateBatchLoader(em, meta, hint, mode, opts = {}) {
 						},
 						orderBys: []
 					};
-					require_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, false);
+					require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, false);
 					const hydrator = preloader.addPreloading(meta, layerNode, query);
 					if (hydrator) {
 						const rows = await em["executeFind"](meta, populateOperation, query, {});

package/build/batchloaders/populateBatchLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"populateBatchLoader.cjs","names":["hintKey","getEmInternalApi","AliasAssigner","keyToNumber","kqDot","indexBy","isPolyHint","getRelationFromMaybePolyKey","ReactiveFieldImpl","oneToManyBatchLoader","manyToManyBatchLoader","oneToOneBatchLoader","loadBatchLoader","toArray","buildHintTree"],"sources":["../../src/batchloaders/populateBatchLoader.ts"],"sourcesContent":["import { type Entity } from \"../Entity.ts\";\nimport { type EntityMetadata } from \"../EntityMetadata.ts\";\nimport { type HintNode, buildHintTree } from \"../HintTree.ts\";\nimport {\n  AliasAssigner,\n  type EntityManager,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  getEmInternalApi,\n  indexBy,\n  keyToNumber,\n  kqDot,\n} from \"../index.ts\";\nimport { type LoadHint } from \"../loadHints.ts\";\nimport { hintKey } from \"../normalizeHints.ts\";\nimport { getRelationFromMaybePolyKey, isPolyHint } from \"../reactiveHints.ts\";\nimport { ReactiveFieldImpl } from \"../relations/ReactiveField.ts\";\nimport { toArray } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\nimport { loadBatchLoader } from \"./loadBatchLoader.ts\";\nimport { manyToManyBatchLoader } from \"./manyToManyBatchLoader.ts\";\nimport { oneToManyBatchLoader } from \"./oneToManyBatchLoader.ts\";\nimport { oneToOneBatchLoader } from \"./oneToOneBatchLoader.ts\";\n\nexport const populateOperation = \"populate\";\n\nexport function populateBatchLoader(\n  em: EntityManager,\n  meta: EntityMetadata,\n  hint: LoadHint<any>,\n  mode: \"preload\" | \"intermixed\",\n  opts: { forceReload?: boolean } = {},\n): BatchLoader<{ entity: Entity; hint: LoadHint<any> }> {\n  // For batching populates, we want different levels of course-ness:\n  // - preloading populates that are only SQL should be batched together as much as possible, but\n  // - intermixed populates (some with custom relations) should be batched as separately as possible\n  //   (while still batching identical populates together) to reduce the chance of promise deadlocks.\n  //\n  // I.e. if we know this is a sql-only hint, we can batch all loads for a given entity\n  // together do leverage join-based preloading.\n  //\n  // However, intermixed batches can be prone to promise deadlocking (one relation .load getting\n  // stuck in a batch that is asking for its own dependencies to load), so if this is an intermixed\n  // hint, then use a batch key that includes the hint itself, which will make it unlikely\n  // for non-sql relations to deadlock on each other/themselves.\n  const batchKey =\n    mode === \"preload\" ? `${meta.tagName}:${opts.forceReload}` : `${meta.tagName}:${hintKey(hint)}:${opts.forceReload}`;\n  return em.getBatchLoader(populateOperation, batchKey, async (populates) => {\n    async function populateLayer(layerMeta: EntityMetadata | undefined, layerNode: HintNode<Entity>): Promise<void> {\n      // Skip join-based preloading if nothing in this layer needs loading. If any entity in the list\n      // needs loading, just load everything\n      const { preloader } = getEmInternalApi(em);\n      // We may not have a layerMeta if we're going through non-field properties\n      if (preloader && layerMeta) {\n        const preloadThisLayer = Object.entries(layerNode.hints).some(([key, hint]) => {\n          for (const entity of hint.entities) {\n            if ((entity as any)[key]?.isLoaded === false && !(entity as any)[key]?.isPreloaded) return true;\n          }\n          return false;\n        });\n        if (preloadThisLayer) {\n          // Do an up-front SQL call of `select id, ...preloads... from table`,\n          const assigner = new AliasAssigner();\n          const meta = layerMeta;\n          const alias = assigner.getAlias(meta.tableName);\n          const entities = [...layerNode.entities].filter((e) => !e.isNewEntity);\n          const ids = entities.map((e) => keyToNumber(meta, e.id));\n          // Create a ParsedFindQuery for `addPreloading` to inject joins into\n          const query: ParsedFindQuery = {\n            // We already have the entities loaded, so can do just `SELECT a.id` + the preload columns\n            selects: [kqDot(alias, \"id\")],\n            tables: [{ alias, join: \"primary\", table: meta.tableName }],\n            condition: {\n              kind: \"exp\",\n              op: \"and\",\n              conditions: [\n                { kind: \"column\", alias, column: \"id\", dbType: meta.idDbType, cond: { kind: \"in\", value: ids } },\n              ],\n            },\n            orderBys: [],\n          };\n          // If we're selecting from small_publishers, join in our base class in case\n          // the preloader wants to join on a column like `publishers.group_id`\n          addTablePerClassJoinsAndClassTag(query, meta, alias, false);\n          const hydrator = preloader.addPreloading(meta, layerNode, query);\n          if (hydrator) {\n            const rows = await em[\"executeFind\"](meta, populateOperation, query, {});\n            const entitiesById = indexBy(entities, (e) => keyToNumber(meta, e.id));\n            const entitiesInOrder = rows.map((row) => entitiesById.get(row[\"id\"]));\n            hydrator(rows, entitiesInOrder);\n          }\n        }\n      }\n\n      // First pass: batch SQL relations directly, fall back to relation.load() for non-SQL\n      const batchPromises = new Set<Promise<void>>();\n      const relationsToPreload: { preload(): void }[] = [];\n      const fallbackPromises: (Promise<any> | undefined)[] = [];\n\n      for (const [key, tree] of Object.entries(layerNode.hints)) {\n        const field = layerMeta?.allFields[key];\n        // Hoist the poly-key parsing out of the per-entity loop; most keys are not poly\n        const isPoly = isPolyHint(key);\n        let loader: BatchLoader<any> | undefined;\n        let batchPromise: Promise<void> | undefined;\n        for (const entity of tree.entities) {\n          const relation = isPoly ? getRelationFromMaybePolyKey(entity, key) : (entity as any)[key];\n          // This happens to let through non-relation hints like 'name' on user, which wasn't intentional,\n          // but currently doesn't blow up (somehow), and is depended on by internal tests.\n          if (!relation || typeof relation.load !== \"function\") {\n            // We don't want to throw on poly hints, because they're not actually loaded on the entity\n            if (isPoly) continue;\n            throw new Error(`Invalid load hint '${key}' on ${entity}`);\n          }\n\n          // If we're populating a hasReactiveField, don't bother loading it\n          // if it's already been calculated (i.e. we have no reason to believe its value\n          // is stale, so we should avoid pulling all of its data into memory).\n          //\n          // (Note that we can't do this same optimization for ReactiveReferenceImpl, because\n          // as a FK, it will always need at least some `.load()` to fetch its entity from the database.\n          // So we go ahead and call `.load()`, assuming it will just load its cached value, but it\n          // will also check internally if it's marked for recalc, and load its load hint if necessary.\n          if (relation instanceof ReactiveFieldImpl && relation.isSet) continue;\n          if (relation.isLoaded && !opts.forceReload) continue;\n          if (relation.isPreloaded) {\n            relation.preload();\n            continue;\n          }\n\n          // For non-derived SQL relations on existing entities, use batch loaders directly\n          // (1 shared promise per batch instead of per-entity async overhead).\n          // Skip new entities (no id) and derived relations (reactive m2m/m2o have extra logic in load).\n          if (!entity.isNewEntity && field) {\n            if (field.kind === \"o2m\") {\n              batchPromise = (loader ??= oneToManyBatchLoader(em, relation)).load(entity.idTagged!);\n              relationsToPreload.push(relation);\n              continue;\n            } else if (field.kind === \"m2m\" && !field.derived) {\n              batchPromise = (loader ??= manyToManyBatchLoader(em, relation)).load(\n                `${relation.columnName}=${entity.id}`,\n              );\n              relationsToPreload.push(relation);\n              continue;\n            } else if (field.kind === \"o2o\") {\n              batchPromise = (loader ??= oneToOneBatchLoader(em, relation)).load(entity.idTagged!);\n              relationsToPreload.push(relation);\n              continue;\n            } else if (field.kind === \"m2o\" && !field.derived) {\n              const taggedId = relation.idTaggedMaybe;\n              if (taggedId) {\n                batchPromise = (loader ??= loadBatchLoader(em, field.otherMetadata())).load({\n                  taggedId,\n                  hint: undefined,\n                });\n                relationsToPreload.push(relation);\n                continue;\n              }\n            }\n          }\n          fallbackPromises.push(relation.load(opts) as Promise<any>);\n        }\n        if (batchPromise) batchPromises.add(batchPromise);\n      }\n\n      if (batchPromises.size > 0 || fallbackPromises.length > 0) {\n        await Promise.all([Promise.all(batchPromises), Promise.all(fallbackPromises)]);\n      }\n      for (const relation of relationsToPreload) {\n        relation.preload();\n      }\n\n      // 2nd breadth-width pass to do nested load hints, this will fan out at the sibling level.\n      // i.e. populateLayer(...reviews...) & populateLayer(...comments...)\n      let nestedLoadPromises: (Promise<void> | undefined)[] | undefined;\n      for (const [key, tree] of Object.entries(layerNode.hints)) {\n        if (Object.keys(tree.hints).length === 0) continue;\n\n        // Get the children we found, i.e. [a1, a2, a3] -> all of their books\n        const childrenByParent = new Map<Entity, Entity[]>();\n        for (const entity of tree.entities) {\n          const relation = getRelationFromMaybePolyKey(entity, key);\n          childrenByParent.set(entity, relation ? toArray(getEvenDeleted(relation)) : []);\n        }\n        if (childrenByParent.size === 0) continue;\n\n        // Rewrite our node.entities to be the next layer of children, i.e. children will be all books, for all of\n        // `[a1, a2, a3]`, but only the books of `a2` need to recurse into `book: reviews` and only the books of\n        // `a3` need to recurse into `book: comments`, so swap `node.entities` (which is currently authors)\n        // with the books. This is what prevents our dataloader-merged TreeHint from over-fetching and loading\n        // the superset load hint for all entities.\n        function rewrite(node: HintNode<Entity>) {\n          const next = new Set<Entity>();\n          for (const entity of node.entities) {\n            const children = childrenByParent.get(entity);\n            if (children) for (const child of children) next.add(child);\n          }\n          node.entities = next;\n          Object.values(node.hints).forEach((node) => rewrite(node));\n        }\n\n        rewrite(tree);\n\n        const nextMeta = (layerMeta?.allFields[key] as any)?.otherMetadata?.();\n        (nestedLoadPromises ??= []).push(populateLayer(nextMeta, tree));\n      }\n      if (nestedLoadPromises) await Promise.all(nestedLoadPromises);\n    }\n\n    await populateLayer(meta, buildHintTree(populates));\n  });\n}\n\n/** Probes `relation` to see if it's a m2o/o2m/m2m relation that supports `getWithDeleted`, otherwise calls `get`. */\nfunction getEvenDeleted(relation: any): any {\n  return \"getWithDeleted\" in relation ? relation.getWithDeleted : relation.get;\n}\n"],"mappings":"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"}
+{"version":3,"file":"populateBatchLoader.cjs","names":["hintKey","getEmInternalApi","AliasAssigner","keyToNumber","kqDot","indexBy","isPolyHint","getRelationFromMaybePolyKey","ReactiveFieldImpl","oneToManyBatchLoader","manyToManyBatchLoader","oneToOneBatchLoader","loadBatchLoader","toArray","buildHintTree"],"sources":["../../src/batchloaders/populateBatchLoader.ts"],"sourcesContent":["import { type Entity } from \"../Entity.ts\";\nimport { type EntityMetadata } from \"../EntityMetadata.ts\";\nimport { type HintNode, buildHintTree } from \"../HintTree.ts\";\nimport {\n  AliasAssigner,\n  type EntityManager,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  getEmInternalApi,\n  indexBy,\n  keyToNumber,\n  kqDot,\n} from \"../index.ts\";\nimport { type LoadHint } from \"../loadHints.ts\";\nimport { hintKey } from \"../normalizeHints.ts\";\nimport { getRelationFromMaybePolyKey, isPolyHint } from \"../reactiveHints.ts\";\nimport { ReactiveFieldImpl } from \"../relations/ReactiveField.ts\";\nimport { toArray } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\nimport { loadBatchLoader } from \"./loadBatchLoader.ts\";\nimport { manyToManyBatchLoader } from \"./manyToManyBatchLoader.ts\";\nimport { oneToManyBatchLoader } from \"./oneToManyBatchLoader.ts\";\nimport { oneToOneBatchLoader } from \"./oneToOneBatchLoader.ts\";\n\nexport const populateOperation = \"populate\";\n\nexport function populateBatchLoader(\n  em: EntityManager,\n  meta: EntityMetadata,\n  hint: LoadHint<any>,\n  mode: \"preload\" | \"intermixed\",\n  opts: { forceReload?: boolean } = {},\n): BatchLoader<{ entity: Entity; hint: LoadHint<any> }> {\n  // For batching populates, we want different levels of course-ness:\n  // - preloading populates that are only SQL should be batched together as much as possible, but\n  // - intermixed populates (some with custom relations) should be batched as separately as possible\n  //   (while still batching identical populates together) to reduce the chance of promise deadlocks.\n  //\n  // I.e. if we know this is a sql-only hint, we can batch all loads for a given entity\n  // together do leverage join-based preloading.\n  //\n  // However, intermixed batches can be prone to promise deadlocking (one relation .load getting\n  // stuck in a batch that is asking for its own dependencies to load), so if this is an intermixed\n  // hint, then use a batch key that includes the hint itself, which will make it unlikely\n  // for non-sql relations to deadlock on each other/themselves.\n  const batchKey =\n    mode === \"preload\" ? `${meta.tagName}:${opts.forceReload}` : `${meta.tagName}:${hintKey(hint)}:${opts.forceReload}`;\n  return em.getBatchLoader(populateOperation, batchKey, async (populates) => {\n    async function populateLayer(layerMeta: EntityMetadata | undefined, layerNode: HintNode<Entity>): Promise<void> {\n      // Skip join-based preloading if nothing in this layer needs loading. If any entity in the list\n      // needs loading, just load everything\n      const { preloader } = getEmInternalApi(em);\n      // We may not have a layerMeta if we're going through non-field properties\n      if (preloader && layerMeta) {\n        const preloadThisLayer = Object.entries(layerNode.hints).some(([key, hint]) => {\n          for (const entity of hint.entities) {\n            if ((entity as any)[key]?.isLoaded === false && !(entity as any)[key]?.isPreloaded) return true;\n          }\n          return false;\n        });\n        if (preloadThisLayer) {\n          // Do an up-front SQL call of `select id, ...preloads... from table`,\n          const assigner = new AliasAssigner();\n          const meta = layerMeta;\n          const alias = assigner.getAlias(meta.tableName);\n          const entities = [...layerNode.entities].filter((e) => !e.isNewEntity);\n          const ids = entities.map((e) => keyToNumber(meta, e.id));\n          // Create a ParsedFindQuery for `addPreloading` to inject joins into\n          const query: ParsedFindQuery = {\n            // We already have the entities loaded, so can do just `SELECT a.id` + the preload columns\n            selects: [kqDot(alias, \"id\")],\n            tables: [{ alias, join: \"primary\", table: meta.tableName }],\n            condition: {\n              kind: \"exp\",\n              op: \"and\",\n              conditions: [\n                { kind: \"column\", alias, column: \"id\", dbType: meta.idDbType, cond: { kind: \"in\", value: ids } },\n              ],\n            },\n            orderBys: [],\n          };\n          // If we're selecting from small_publishers, join in our base class in case\n          // the preloader wants to join on a column like `publishers.group_id`\n          addTablePerClassJoinsAndClassTag(query, meta, alias, false);\n          const hydrator = preloader.addPreloading(meta, layerNode, query);\n          if (hydrator) {\n            const rows = await em[\"executeFind\"](meta, populateOperation, query, {});\n            const entitiesById = indexBy(entities, (e) => keyToNumber(meta, e.id));\n            const entitiesInOrder = rows.map((row) => entitiesById.get(row[\"id\"]));\n            hydrator(rows, entitiesInOrder);\n          }\n        }\n      }\n\n      // First pass: batch SQL relations directly, fall back to relation.load() for non-SQL\n      const batchPromises = new Set<Promise<void>>();\n      const relationsToPreload: { preload(): void }[] = [];\n      const fallbackPromises: (Promise<any> | undefined)[] = [];\n\n      for (const [key, tree] of Object.entries(layerNode.hints)) {\n        const field = layerMeta?.allFields[key];\n        // Hoist the poly-key parsing out of the per-entity loop; most keys are not poly\n        const isPoly = isPolyHint(key);\n        let loader: BatchLoader<any> | undefined;\n        let batchPromise: Promise<void> | undefined;\n        for (const entity of tree.entities) {\n          const relation = isPoly ? getRelationFromMaybePolyKey(entity, key) : (entity as any)[key];\n          // This happens to let through non-relation hints like 'name' on user, which wasn't intentional,\n          // but currently doesn't blow up (somehow), and is depended on by internal tests.\n          if (!relation || typeof relation.load !== \"function\") {\n            // We don't want to throw on poly hints, because they're not actually loaded on the entity\n            if (isPoly) continue;\n            throw new Error(`Invalid load hint '${key}' on ${entity}`);\n          }\n\n          // If we're populating a hasReactiveField, don't bother loading it\n          // if it's already been calculated (i.e. we have no reason to believe its value\n          // is stale, so we should avoid pulling all of its data into memory).\n          //\n          // (Note that we can't do this same optimization for ReactiveReferenceImpl, because\n          // as a FK, it will always need at least some `.load()` to fetch its entity from the database.\n          // So we go ahead and call `.load()`, assuming it will just load its cached value, but it\n          // will also check internally if it's marked for recalc, and load its load hint if necessary.\n          if (relation instanceof ReactiveFieldImpl && relation.isSet) continue;\n          if (relation.isLoaded && !opts.forceReload) continue;\n          if (relation.isPreloaded) {\n            relation.preload();\n            continue;\n          }\n\n          // For non-derived SQL relations on existing entities, use batch loaders directly\n          // (1 shared promise per batch instead of per-entity async overhead).\n          // Skip new entities (no id) and derived relations (reactive m2m/m2o have extra logic in load).\n          if (!entity.isNewEntity && field) {\n            if (field.kind === \"o2m\") {\n              batchPromise = (loader ??= oneToManyBatchLoader(em, relation)).load(entity.idTagged!);\n              relationsToPreload.push(relation);\n              continue;\n            } else if (field.kind === \"m2m\" && !field.derived) {\n              batchPromise = (loader ??= manyToManyBatchLoader(em, relation)).load(\n                `${relation.columnName}=${entity.id}`,\n              );\n              relationsToPreload.push(relation);\n              continue;\n            } else if (field.kind === \"o2o\") {\n              batchPromise = (loader ??= oneToOneBatchLoader(em, relation)).load(entity.idTagged!);\n              relationsToPreload.push(relation);\n              continue;\n            } else if (field.kind === \"m2o\" && !field.derived) {\n              const taggedId = relation.idTaggedMaybe;\n              if (taggedId) {\n                batchPromise = (loader ??= loadBatchLoader(em, field.otherMetadata())).load({\n                  taggedId,\n                  hint: undefined,\n                });\n                relationsToPreload.push(relation);\n                continue;\n              }\n            }\n          }\n          fallbackPromises.push(relation.load(opts) as Promise<any>);\n        }\n        if (batchPromise) batchPromises.add(batchPromise);\n      }\n\n      if (batchPromises.size > 0 || fallbackPromises.length > 0) {\n        await Promise.all([Promise.all(batchPromises), Promise.all(fallbackPromises)]);\n      }\n      for (const relation of relationsToPreload) {\n        relation.preload();\n      }\n\n      // 2nd breadth-width pass to do nested load hints, this will fan out at the sibling level.\n      // i.e. populateLayer(...reviews...) & populateLayer(...comments...)\n      let nestedLoadPromises: (Promise<void> | undefined)[] | undefined;\n      for (const [key, tree] of Object.entries(layerNode.hints)) {\n        if (Object.keys(tree.hints).length === 0) continue;\n\n        // Get the children we found, i.e. [a1, a2, a3] -> all of their books\n        const childrenByParent = new Map<Entity, Entity[]>();\n        for (const entity of tree.entities) {\n          const relation = getRelationFromMaybePolyKey(entity, key);\n          childrenByParent.set(entity, relation ? toArray(getEvenDeleted(relation)) : []);\n        }\n        if (childrenByParent.size === 0) continue;\n\n        // Rewrite our node.entities to be the next layer of children, i.e. children will be all books, for all of\n        // `[a1, a2, a3]`, but only the books of `a2` need to recurse into `book: reviews` and only the books of\n        // `a3` need to recurse into `book: comments`, so swap `node.entities` (which is currently authors)\n        // with the books. This is what prevents our dataloader-merged TreeHint from over-fetching and loading\n        // the superset load hint for all entities.\n        function rewrite(node: HintNode<Entity>) {\n          const next = new Set<Entity>();\n          for (const entity of node.entities) {\n            const children = childrenByParent.get(entity);\n            if (children) for (const child of children) next.add(child);\n          }\n          node.entities = next;\n          Object.values(node.hints).forEach((node) => rewrite(node));\n        }\n\n        rewrite(tree);\n\n        const nextMeta = (layerMeta?.allFields[key] as any)?.otherMetadata?.();\n        (nestedLoadPromises ??= []).push(populateLayer(nextMeta, tree));\n      }\n      if (nestedLoadPromises) await Promise.all(nestedLoadPromises);\n    }\n\n    await populateLayer(meta, buildHintTree(populates));\n  });\n}\n\n/** Probes `relation` to see if it's a m2o/o2m/m2m relation that supports `getWithDeleted`, otherwise calls `get`. */\nfunction getEvenDeleted(relation: any): any {\n  return \"getWithDeleted\" in relation ? relation.getWithDeleted : relation.get;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAwBA,MAAa,oBAAoB;AAEjC,SAAgB,oBACd,IACA,MACA,MACA,MACA,OAAkC,CAAC,GACmB;CAatD,MAAM,WACJ,SAAS,YAAY,GAAG,KAAK,QAAQ,GAAG,KAAK,gBAAgB,GAAG,KAAK,QAAQ,GAAGA,uBAAAA,QAAQ,IAAI,EAAE,GAAG,KAAK;CACxG,OAAO,GAAG,eAAe,mBAAmB,UAAU,OAAO,cAAc;EACzE,eAAe,cAAc,WAAuC,WAA4C;GAG9G,MAAM,EAAE,cAAcC,sBAAAA,iBAAiB,EAAE;GAEzC,IAAI,aAAa,WACU;QAAA,OAAO,QAAQ,UAAU,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,UAAU;KAC7E,KAAK,MAAM,UAAU,KAAK,UACxB,IAAK,OAAe,IAAI,EAAE,aAAa,SAAS,CAAE,OAAe,IAAI,EAAE,aAAa,OAAO;KAE7F,OAAO;IACT,CACmB,GAAG;KAEpB,MAAM,WAAW,IAAIC,kCAAAA,cAAc;KACnC,MAAM,OAAO;KACb,MAAM,QAAQ,SAAS,SAAS,KAAK,SAAS;KAC9C,MAAM,WAAW,CAAC,GAAG,UAAU,QAAQ,CAAC,CAAC,QAAQ,MAAM,CAAC,EAAE,WAAW;KACrE,MAAM,MAAM,SAAS,KAAK,MAAMC,aAAAA,YAAY,MAAM,EAAE,EAAE,CAAC;KAEvD,MAAM,QAAyB;MAE7B,SAAS,CAACC,6BAAAA,MAAM,OAAO,IAAI,CAAC;MAC5B,QAAQ,CAAC;OAAE;OAAO,MAAM;OAAW,OAAO,KAAK;MAAU,CAAC;MAC1D,WAAW;OACT,MAAM;OACN,IAAI;OACJ,YAAY,CACV;QAAE,MAAM;QAAU;QAAO,QAAQ;QAAM,QAAQ,KAAK;QAAU,MAAM;SAAE,MAAM;SAAM,OAAO;QAAI;OAAE,CACjG;MACF;MACA,UAAU,CAAC;KACb;KAGA,iCAAA,iCAAiC,OAAO,MAAM,OAAO,KAAK;KAC1D,MAAM,WAAW,UAAU,cAAc,MAAM,WAAW,KAAK;KAC/D,IAAI,UAAU;MACZ,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,MAAM,mBAAmB,OAAO,CAAC,CAAC;MACvE,MAAM,eAAeC,cAAAA,QAAQ,WAAW,MAAMF,aAAAA,YAAY,MAAM,EAAE,EAAE,CAAC;MAErE,SAAS,MADe,KAAK,KAAK,QAAQ,aAAa,IAAI,IAAI,KAAK,CACvC,CAAC;KAChC;IACF;;GAIF,MAAM,gCAAgB,IAAI,IAAmB;GAC7C,MAAM,qBAA4C,CAAC;GACnD,MAAM,mBAAiD,CAAC;GAExD,KAAK,MAAM,CAAC,KAAK,SAAS,OAAO,QAAQ,UAAU,KAAK,GAAG;IACzD,MAAM,QAAQ,WAAW,UAAU;IAEnC,MAAM,SAASG,sBAAAA,WAAW,GAAG;IAC7B,IAAI;IACJ,IAAI;IACJ,KAAK,MAAM,UAAU,KAAK,UAAU;KAClC,MAAM,WAAW,SAASC,sBAAAA,4BAA4B,QAAQ,GAAG,IAAK,OAAe;KAGrF,IAAI,CAAC,YAAY,OAAO,SAAS,SAAS,YAAY;MAEpD,IAAI,QAAQ;MACZ,MAAM,IAAI,MAAM,sBAAsB,IAAI,OAAO,QAAQ;KAC3D;KAUA,IAAI,oBAAoBC,gCAAAA,qBAAqB,SAAS,OAAO;KAC7D,IAAI,SAAS,YAAY,CAAC,KAAK,aAAa;KAC5C,IAAI,SAAS,aAAa;MACxB,SAAS,QAAQ;MACjB;KACF;KAKA,IAAI,CAAC,OAAO,eAAe,OAAO;MAChC,IAAI,MAAM,SAAS,OAAO;OACxB,gBAAgB,WAAWC,0CAAAA,qBAAqB,IAAI,QAAQ,EAAA,CAAG,KAAK,OAAO,QAAS;OACpF,mBAAmB,KAAK,QAAQ;OAChC;MACF,OAAO,IAAI,MAAM,SAAS,SAAS,CAAC,MAAM,SAAS;OACjD,gBAAgB,WAAWC,2CAAAA,sBAAsB,IAAI,QAAQ,EAAA,CAAG,KAC9D,GAAG,SAAS,WAAW,GAAG,OAAO,IACnC;OACA,mBAAmB,KAAK,QAAQ;OAChC;MACF,OAAO,IAAI,MAAM,SAAS,OAAO;OAC/B,gBAAgB,WAAWC,yCAAAA,oBAAoB,IAAI,QAAQ,EAAA,CAAG,KAAK,OAAO,QAAS;OACnF,mBAAmB,KAAK,QAAQ;OAChC;MACF,OAAO,IAAI,MAAM,SAAS,SAAS,CAAC,MAAM,SAAS;OACjD,MAAM,WAAW,SAAS;OAC1B,IAAI,UAAU;QACZ,gBAAgB,WAAWC,qCAAAA,gBAAgB,IAAI,MAAM,cAAc,CAAC,EAAA,CAAG,KAAK;SAC1E;SACA,MAAM,KAAA;QACR,CAAC;QACD,mBAAmB,KAAK,QAAQ;QAChC;OACF;MACF;KACF;KACA,iBAAiB,KAAK,SAAS,KAAK,IAAI,CAAiB;IAC3D;IACA,IAAI,cAAc,cAAc,IAAI,YAAY;GAClD;GAEA,IAAI,cAAc,OAAO,KAAK,iBAAiB,SAAS,GACtD,MAAM,QAAQ,IAAI,CAAC,QAAQ,IAAI,aAAa,GAAG,QAAQ,IAAI,gBAAgB,CAAC,CAAC;GAE/E,KAAK,MAAM,YAAY,oBACrB,SAAS,QAAQ;GAKnB,IAAI;GACJ,KAAK,MAAM,CAAC,KAAK,SAAS,OAAO,QAAQ,UAAU,KAAK,GAAG;IACzD,IAAI,OAAO,KAAK,KAAK,KAAK,CAAC,CAAC,WAAW,GAAG;IAG1C,MAAM,mCAAmB,IAAI,IAAsB;IACnD,KAAK,MAAM,UAAU,KAAK,UAAU;KAClC,MAAM,WAAWL,sBAAAA,4BAA4B,QAAQ,GAAG;KACxD,iBAAiB,IAAI,QAAQ,WAAWM,cAAAA,QAAQ,eAAe,QAAQ,CAAC,IAAI,CAAC,CAAC;IAChF;IACA,IAAI,iBAAiB,SAAS,GAAG;IAOjC,SAAS,QAAQ,MAAwB;KACvC,MAAM,uBAAO,IAAI,IAAY;KAC7B,KAAK,MAAM,UAAU,KAAK,UAAU;MAClC,MAAM,WAAW,iBAAiB,IAAI,MAAM;MAC5C,IAAI,UAAU,KAAK,MAAM,SAAS,UAAU,KAAK,IAAI,KAAK;KAC5D;KACA,KAAK,WAAW;KAChB,OAAO,OAAO,KAAK,KAAK,CAAC,CAAC,SAAS,SAAS,QAAQ,IAAI,CAAC;IAC3D;IAEA,QAAQ,IAAI;IAEZ,MAAM,YAAY,WAAW,UAAU,KAAA,EAAc,gBAAgB;IACrE,CAAC,uBAAuB,CAAC,EAAA,CAAG,KAAK,cAAc,UAAU,IAAI,CAAC;GAChE;GACA,IAAI,oBAAoB,MAAM,QAAQ,IAAI,kBAAkB;EAC9D;EAEA,MAAM,cAAc,MAAMC,iBAAAA,cAAc,SAAS,CAAC;CACpD,CAAC;AACH;;AAGA,SAAS,eAAe,UAAoB;CAC1C,OAAO,oBAAoB,WAAW,SAAS,iBAAiB,SAAS;AAC3E"}

package/build/batchloaders/populateBatchLoader.js

@@ -1,22 +1,22 @@
 import "./BatchLoader.js";
-import { kqDot } from "../keywords.js";
-import { manyToManyBatchLoader } from "./manyToManyBatchLoader.js";
-import { oneToManyBatchLoader } from "./oneToManyBatchLoader.js";
+import { kqDot } from "../queries/sql/keywords.js";
 import { oneToOneBatchLoader } from "./oneToOneBatchLoader.js";
-import { ReactiveFieldImpl } from "../relations/ReactiveField.js";
-import { keyToNumber } from "../keys.js";
-import "../EntityMetadata.js";
+import { oneToManyBatchLoader } from "./oneToManyBatchLoader.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
 import { getRelationFromMaybePolyKey, isPolyHint } from "../reactiveHints.js";
 import { hintKey } from "../normalizeHints.js";
 import "../loadHints.js";
 import { indexBy, toArray } from "../utils.js";
+import { manyToManyBatchLoader } from "./manyToManyBatchLoader.js";
+import { ReactiveFieldImpl } from "../relations/ReactiveField.js";
+import { keyToNumber } from "../keys.js";
+import "../EntityMetadata.js";
+import { AliasAssigner } from "../queries/sql/AliasAssigner.js";
 import { buildHintTree } from "../HintTree.js";
 import "../index.js";
 import { loadBatchLoader } from "./loadBatchLoader.js";
 import { getEmInternalApi } from "../EntityManager.js";
 import "../Entity.js";
-import { addTablePerClassJoinsAndClassTag } from "../QueryParser.js";
-import { AliasAssigner } from "../AliasAssigner.js";
 //#region src/batchloaders/populateBatchLoader.ts
 const populateOperation = "populate";
 function populateBatchLoader(em, meta, hint, mode, opts = {}) {

package/build/batchloaders/recursiveChildrenBatchLoader.cjs

@@ -1,17 +1,17 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./BatchLoader.cjs");
-const require_keywords = require("../keywords.cjs");
 const require_relations_Collection = require("../relations/Collection.cjs");
+const require_fields = require("../fields.cjs");
+const require_queries_sql_keywords = require("../queries/sql/keywords.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
 const require_relations_OneToOneReference = require("../relations/OneToOneReference.cjs");
 require("../relations/RecursiveCollection.cjs");
-const require_keys = require("../keys.cjs");
-const require_fields = require("../fields.cjs");
 const require_utils = require("../utils.cjs");
+const require_keys = require("../keys.cjs");
+const require_configure = require("../configure.cjs");
 require("../index.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
 require("../Entity.cjs");
-const require_configure = require("../configure.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
 //#region src/batchloaders/recursiveChildrenBatchLoader.ts
 const recursiveChildrenOperation = "o2m-recursive";
 function recursiveChildrenBatchLoader(em, collection) {
@@ -46,16 +46,16 @@ function recursiveChildrenBatchLoader(em, collection) {
 				query: {
 					kind: "raw",
 					sql: `
-             SELECT b.id, b.${columnName} FROM ${require_keywords.kq(meta.tableName)} b WHERE b.${columnName} = ANY(?)
+             SELECT b.id, b.${columnName} FROM ${require_queries_sql_keywords.kq(meta.tableName)} b WHERE b.${columnName} = ANY(?)
              UNION
-             SELECT r.id, r.${columnName} FROM ${require_keywords.kq(meta.tableName)} r JOIN ${alias}_cte ON r.${columnName} = ${alias}_cte.id
+             SELECT r.id, r.${columnName} FROM ${require_queries_sql_keywords.kq(meta.tableName)} r JOIN ${alias}_cte ON r.${columnName} = ${alias}_cte.id
             `,
 					bindings: [require_keys.deTagIds(meta, parents.map((e) => e.idTagged))]
 				},
 				recursive: true
 			}]
 		};
-		require_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
+		require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
 		const rowData = await em["executeFindRowData"](meta, recursiveChildrenOperation, query, {});
 		const entities = em["hydrateAndFinalize"](meta.cstr, rowData);
 		const entitiesById = require_utils.groupBy(entities, (entity) => {

package/build/batchloaders/recursiveChildrenBatchLoader.cjs.map

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

package/build/batchloaders/recursiveChildrenBatchLoader.js

@@ -1,16 +1,16 @@
 import "./BatchLoader.js";
-import { kq } from "../keywords.js";
 import { isLoadedCollection } from "../relations/Collection.js";
+import { getField } from "../fields.js";
+import { kq } from "../queries/sql/keywords.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
 import { isLoadedOneToOneReference } from "../relations/OneToOneReference.js";
 import "../relations/RecursiveCollection.js";
-import { deTagIds, maybeResolveReferenceToId } from "../keys.js";
-import { getField } from "../fields.js";
 import { abbreviation, groupBy } from "../utils.js";
+import { deTagIds, maybeResolveReferenceToId } from "../keys.js";
+import { getMetadataForType } from "../configure.js";
 import "../index.js";
 import { getEmInternalApi } from "../EntityManager.js";
 import "../Entity.js";
-import { getMetadataForType } from "../configure.js";
-import { addTablePerClassJoinsAndClassTag } from "../QueryParser.js";
 //#region src/batchloaders/recursiveChildrenBatchLoader.ts
 const recursiveChildrenOperation = "o2m-recursive";
 function recursiveChildrenBatchLoader(em, collection) {

package/build/batchloaders/recursiveM2mBatchLoader.cjs

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./BatchLoader.cjs");
-const require_keywords = require("../keywords.cjs");
 const require_relations_Collection = require("../relations/Collection.cjs");
+const require_queries_sql_keywords = require("../queries/sql/keywords.cjs");
 require("../relations/RecursiveCollection.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");
 require("../index.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
 require("../Entity.cjs");
@@ -23,7 +23,7 @@ function recursiveM2mBatchLoader(em, collection) {
 		const seedIds = require_keys.deTagIds(meta, entities.map((e) => e.idTagged));
 		const jt = require_utils.abbreviation(joinTableName);
 		const query = {
-			selects: [require_keywords.kqStar(jt)],
+			selects: [require_queries_sql_keywords.kqStar(jt)],
 			tables: [{
 				alias: jt,
 				join: "primary",
@@ -39,9 +39,9 @@ function recursiveM2mBatchLoader(em, collection) {
 				query: {
 					kind: "raw",
 					sql: `
-              SELECT b.* FROM ${require_keywords.kq(joinTableName)} b WHERE ${require_keywords.kqDot("b", thisColumn)} = ANY(?)
+              SELECT b.* FROM ${require_queries_sql_keywords.kq(joinTableName)} b WHERE ${require_queries_sql_keywords.kqDot("b", thisColumn)} = ANY(?)
               UNION
-              SELECT r.* FROM ${require_keywords.kq(joinTableName)} r JOIN cte ON ${require_keywords.kqDot("r", thisColumn)} = cte.${require_keywords.kq(otherColumn)}
+              SELECT r.* FROM ${require_queries_sql_keywords.kq(joinTableName)} r JOIN cte ON ${require_queries_sql_keywords.kqDot("r", thisColumn)} = cte.${require_queries_sql_keywords.kq(otherColumn)}
             `,
 					bindings: [seedIds]
 				},

package/build/batchloaders/recursiveM2mBatchLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"recursiveM2mBatchLoader.cjs","names":["getMetadataForField","deTagIds","abbreviation","kqStar","kq","kqDot","keyToTaggedId","getEmInternalApi","isLoadedCollection"],"sources":["../../src/batchloaders/recursiveM2mBatchLoader.ts"],"sourcesContent":["import { type Entity } from \"../Entity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"../EntityManager.ts\";\nimport {\n  type ManyToManyField,\n  type ParsedFindQuery,\n  deTagIds,\n  getMetadataForField,\n  isLoadedCollection,\n  keyToTaggedId,\n  kq,\n  kqDot,\n  kqStar,\n} from \"../index.ts\";\nimport { type RecursiveM2mCollectionImpl } from \"../relations/RecursiveCollection.ts\";\nimport { abbreviation } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\n\nexport const recursiveM2mOperation = \"m2m-recursive\";\n\nexport function recursiveM2mBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: RecursiveM2mCollectionImpl<T, U>,\n): BatchLoader<Entity> {\n  let { meta, fieldName } = collection;\n  meta = getMetadataForField(meta, collection.m2mFieldName);\n  const batchKey = `${meta.tableName}-${fieldName}`;\n  return em.getBatchLoader(recursiveM2mOperation, batchKey, async (entities) => {\n    const m2mField = meta.allFields[collection.m2mFieldName] as ManyToManyField;\n    const { joinTableName, columnNames } = m2mField;\n    const thisColumn = columnNames[0];\n    const otherColumn = columnNames[1];\n\n    const seedIds = deTagIds(\n      meta,\n      entities.map((e) => e.idTagged),\n    );\n\n    // Use a recursive CTE to walk the join table and return all join rows for the seed\n    // entities and all transitively-reachable entities. JoinRows.loadRows then calls\n    // em.loadAll internally to hydrate the actual entities on both sides.\n    const jt = abbreviation(joinTableName);\n    const query: ParsedFindQuery = {\n      selects: [kqStar(jt)],\n      tables: [{ alias: jt, join: \"primary\", table: \"cte\" }],\n      orderBys: [{ alias: jt, column: \"id\", order: \"ASC\" }],\n      ctes: [\n        {\n          alias: \"cte\",\n          query: {\n            kind: \"raw\",\n            // Base case returns full join rows for the seed entities; recursive case\n            // follows otherColumn → thisColumn to discover transitively-reachable rows.\n            sql: `\n              SELECT b.* FROM ${kq(joinTableName)} b WHERE ${kqDot(\"b\", thisColumn)} = ANY(?)\n              UNION\n              SELECT r.* FROM ${kq(joinTableName)} r JOIN cte ON ${kqDot(\"r\", thisColumn)} = cte.${kq(otherColumn)}\n            `,\n            bindings: [seedIds],\n          },\n          recursive: true,\n        },\n      ],\n    };\n\n    const joinTableRows = await em[\"executeFind\"](\n      meta,\n      recursiveM2mOperation,\n      query,\n      // No LIMIT needed for join rows\n      { limit: undefined },\n    );\n\n    // Collect all entity IDs from both sides of the join rows. Entities that only appear\n    // on otherColumn (not thisColumn) are leaf nodes with no outgoing connections — since\n    // the CTE transitively discovers everything reachable, we know their m2m is empty and\n    // can mark it loaded here, avoiding a separate load via findUnloadedCollections.\n    const uniqueIds = new Set(entities.map((e) => e.idTagged));\n    for (const row of joinTableRows) {\n      uniqueIds.add(keyToTaggedId(meta, row[thisColumn])!);\n      uniqueIds.add(keyToTaggedId(meta, row[otherColumn])!);\n    }\n\n    const m2mCollection = (entities[0] as any)[collection.m2mFieldName];\n    const joinRows = getEmInternalApi(em).joinRows(m2mCollection);\n\n    // loadRows calls em.loadAll internally to hydrate all referenced entities\n    const tuples: [string, string][] = [...uniqueIds].map((id) => [thisColumn, id]);\n    await joinRows.loadRows(tuples, joinTableRows);\n\n    // Set preloaded relations and call preload() for each entity's m2m collection\n    const api = getEmInternalApi(em);\n    for (const id of uniqueIds) {\n      const entity = em.getEntity(id);\n      if (!entity) continue;\n      const others = joinRows.getOthers(thisColumn, entity);\n      api.setPreloadedRelation(entity.idTagged!, m2mField.fieldName, others);\n      (entity as any)[m2mField.fieldName].preload();\n    }\n\n    // Mark any entity whose m2m is still not loaded as having an empty collection (leaf nodes)\n    for (const id of uniqueIds) {\n      const entity = em.getEntity(id);\n      if (!entity) continue;\n      if (!isLoadedCollection((entity as any)[m2mField.fieldName])) {\n        api.setPreloadedRelation(entity.idTagged!, m2mField.fieldName, []);\n        (entity as any)[m2mField.fieldName].preload();\n      }\n    }\n  });\n}\n"],"mappings":";;;;;;;;;;;;AAiBA,MAAa,wBAAwB;AAErC,SAAgB,wBACd,IACA,YACqB;CACrB,IAAI,EAAE,MAAM,cAAc;CAC1B,OAAOA,uBAAAA,oBAAoB,MAAM,WAAW,YAAY;CACxD,MAAM,WAAW,GAAG,KAAK,UAAU,GAAG;CACtC,OAAO,GAAG,eAAe,uBAAuB,UAAU,OAAO,aAAa;EAC5E,MAAM,WAAW,KAAK,UAAU,WAAW;EAC3C,MAAM,EAAE,eAAe,gBAAgB;EACvC,MAAM,aAAa,YAAY;EAC/B,MAAM,cAAc,YAAY;EAEhC,MAAM,UAAUC,aAAAA,SACd,MACA,SAAS,KAAK,MAAM,EAAE,QAAQ,CAChC;EAKA,MAAM,KAAKC,cAAAA,aAAa,aAAa;EACrC,MAAM,QAAyB;GAC7B,SAAS,CAACC,iBAAAA,OAAO,EAAE,CAAC;GACpB,QAAQ,CAAC;IAAE,OAAO;IAAI,MAAM;IAAW,OAAO;GAAM,CAAC;GACrD,UAAU,CAAC;IAAE,OAAO;IAAI,QAAQ;IAAM,OAAO;GAAM,CAAC;GACpD,MAAM,CACJ;IACE,OAAO;IACP,OAAO;KACL,MAAM;KAGN,KAAK;gCACeC,iBAAAA,GAAG,aAAa,EAAE,WAAWC,iBAAAA,MAAM,KAAK,UAAU,EAAE;;gCAEpDD,iBAAAA,GAAG,aAAa,EAAE,iBAAiBC,iBAAAA,MAAM,KAAK,UAAU,EAAE,SAASD,iBAAAA,GAAG,WAAW,EAAE;;KAEvG,UAAU,CAAC,OAAO;IACpB;IACA,WAAW;GACb,CACF;EACF;EAEA,MAAM,gBAAgB,MAAM,GAAG,cAAc,CAC3C,MACA,uBACA,OAEA,EAAE,OAAO,KAAA,EAAU,CACrB;EAMA,MAAM,YAAY,IAAI,IAAI,SAAS,KAAK,MAAM,EAAE,QAAQ,CAAC;EACzD,KAAK,MAAM,OAAO,eAAe;GAC/B,UAAU,IAAIE,aAAAA,cAAc,MAAM,IAAI,WAAW,CAAE;GACnD,UAAU,IAAIA,aAAAA,cAAc,MAAM,IAAI,YAAY,CAAE;EACtD;EAEA,MAAM,gBAAiB,SAAS,EAAE,CAAS,WAAW;EACtD,MAAM,WAAWC,sBAAAA,iBAAiB,EAAE,CAAC,CAAC,SAAS,aAAa;EAG5D,MAAM,SAA6B,CAAC,GAAG,SAAS,CAAC,CAAC,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC;EAC9E,MAAM,SAAS,SAAS,QAAQ,aAAa;EAG7C,MAAM,MAAMA,sBAAAA,iBAAiB,EAAE;EAC/B,KAAK,MAAM,MAAM,WAAW;GAC1B,MAAM,SAAS,GAAG,UAAU,EAAE;GAC9B,IAAI,CAAC,QAAQ;GACb,MAAM,SAAS,SAAS,UAAU,YAAY,MAAM;GACpD,IAAI,qBAAqB,OAAO,UAAW,SAAS,WAAW,MAAM;GACrE,OAAgB,SAAS,UAAU,CAAC,QAAQ;EAC9C;EAGA,KAAK,MAAM,MAAM,WAAW;GAC1B,MAAM,SAAS,GAAG,UAAU,EAAE;GAC9B,IAAI,CAAC,QAAQ;GACb,IAAI,CAACC,6BAAAA,mBAAoB,OAAe,SAAS,UAAU,GAAG;IAC5D,IAAI,qBAAqB,OAAO,UAAW,SAAS,WAAW,CAAC,CAAC;IACjE,OAAgB,SAAS,UAAU,CAAC,QAAQ;GAC9C;EACF;CACF,CAAC;AACH"}
+{"version":3,"file":"recursiveM2mBatchLoader.cjs","names":["getMetadataForField","deTagIds","abbreviation","kqStar","kq","kqDot","keyToTaggedId","getEmInternalApi","isLoadedCollection"],"sources":["../../src/batchloaders/recursiveM2mBatchLoader.ts"],"sourcesContent":["import { type Entity } from \"../Entity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"../EntityManager.ts\";\nimport {\n  type ManyToManyField,\n  type ParsedFindQuery,\n  deTagIds,\n  getMetadataForField,\n  isLoadedCollection,\n  keyToTaggedId,\n  kq,\n  kqDot,\n  kqStar,\n} from \"../index.ts\";\nimport { type RecursiveM2mCollectionImpl } from \"../relations/RecursiveCollection.ts\";\nimport { abbreviation } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\n\nexport const recursiveM2mOperation = \"m2m-recursive\";\n\nexport function recursiveM2mBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: RecursiveM2mCollectionImpl<T, U>,\n): BatchLoader<Entity> {\n  let { meta, fieldName } = collection;\n  meta = getMetadataForField(meta, collection.m2mFieldName);\n  const batchKey = `${meta.tableName}-${fieldName}`;\n  return em.getBatchLoader(recursiveM2mOperation, batchKey, async (entities) => {\n    const m2mField = meta.allFields[collection.m2mFieldName] as ManyToManyField;\n    const { joinTableName, columnNames } = m2mField;\n    const thisColumn = columnNames[0];\n    const otherColumn = columnNames[1];\n\n    const seedIds = deTagIds(\n      meta,\n      entities.map((e) => e.idTagged),\n    );\n\n    // Use a recursive CTE to walk the join table and return all join rows for the seed\n    // entities and all transitively-reachable entities. JoinRows.loadRows then calls\n    // em.loadAll internally to hydrate the actual entities on both sides.\n    const jt = abbreviation(joinTableName);\n    const query: ParsedFindQuery = {\n      selects: [kqStar(jt)],\n      tables: [{ alias: jt, join: \"primary\", table: \"cte\" }],\n      orderBys: [{ alias: jt, column: \"id\", order: \"ASC\" }],\n      ctes: [\n        {\n          alias: \"cte\",\n          query: {\n            kind: \"raw\",\n            // Base case returns full join rows for the seed entities; recursive case\n            // follows otherColumn → thisColumn to discover transitively-reachable rows.\n            sql: `\n              SELECT b.* FROM ${kq(joinTableName)} b WHERE ${kqDot(\"b\", thisColumn)} = ANY(?)\n              UNION\n              SELECT r.* FROM ${kq(joinTableName)} r JOIN cte ON ${kqDot(\"r\", thisColumn)} = cte.${kq(otherColumn)}\n            `,\n            bindings: [seedIds],\n          },\n          recursive: true,\n        },\n      ],\n    };\n\n    const joinTableRows = await em[\"executeFind\"](\n      meta,\n      recursiveM2mOperation,\n      query,\n      // No LIMIT needed for join rows\n      { limit: undefined },\n    );\n\n    // Collect all entity IDs from both sides of the join rows. Entities that only appear\n    // on otherColumn (not thisColumn) are leaf nodes with no outgoing connections — since\n    // the CTE transitively discovers everything reachable, we know their m2m is empty and\n    // can mark it loaded here, avoiding a separate load via findUnloadedCollections.\n    const uniqueIds = new Set(entities.map((e) => e.idTagged));\n    for (const row of joinTableRows) {\n      uniqueIds.add(keyToTaggedId(meta, row[thisColumn])!);\n      uniqueIds.add(keyToTaggedId(meta, row[otherColumn])!);\n    }\n\n    const m2mCollection = (entities[0] as any)[collection.m2mFieldName];\n    const joinRows = getEmInternalApi(em).joinRows(m2mCollection);\n\n    // loadRows calls em.loadAll internally to hydrate all referenced entities\n    const tuples: [string, string][] = [...uniqueIds].map((id) => [thisColumn, id]);\n    await joinRows.loadRows(tuples, joinTableRows);\n\n    // Set preloaded relations and call preload() for each entity's m2m collection\n    const api = getEmInternalApi(em);\n    for (const id of uniqueIds) {\n      const entity = em.getEntity(id);\n      if (!entity) continue;\n      const others = joinRows.getOthers(thisColumn, entity);\n      api.setPreloadedRelation(entity.idTagged!, m2mField.fieldName, others);\n      (entity as any)[m2mField.fieldName].preload();\n    }\n\n    // Mark any entity whose m2m is still not loaded as having an empty collection (leaf nodes)\n    for (const id of uniqueIds) {\n      const entity = em.getEntity(id);\n      if (!entity) continue;\n      if (!isLoadedCollection((entity as any)[m2mField.fieldName])) {\n        api.setPreloadedRelation(entity.idTagged!, m2mField.fieldName, []);\n        (entity as any)[m2mField.fieldName].preload();\n      }\n    }\n  });\n}\n"],"mappings":";;;;;;;;;;;;AAiBA,MAAa,wBAAwB;AAErC,SAAgB,wBACd,IACA,YACqB;CACrB,IAAI,EAAE,MAAM,cAAc;CAC1B,OAAOA,uBAAAA,oBAAoB,MAAM,WAAW,YAAY;CACxD,MAAM,WAAW,GAAG,KAAK,UAAU,GAAG;CACtC,OAAO,GAAG,eAAe,uBAAuB,UAAU,OAAO,aAAa;EAC5E,MAAM,WAAW,KAAK,UAAU,WAAW;EAC3C,MAAM,EAAE,eAAe,gBAAgB;EACvC,MAAM,aAAa,YAAY;EAC/B,MAAM,cAAc,YAAY;EAEhC,MAAM,UAAUC,aAAAA,SACd,MACA,SAAS,KAAK,MAAM,EAAE,QAAQ,CAChC;EAKA,MAAM,KAAKC,cAAAA,aAAa,aAAa;EACrC,MAAM,QAAyB;GAC7B,SAAS,CAACC,6BAAAA,OAAO,EAAE,CAAC;GACpB,QAAQ,CAAC;IAAE,OAAO;IAAI,MAAM;IAAW,OAAO;GAAM,CAAC;GACrD,UAAU,CAAC;IAAE,OAAO;IAAI,QAAQ;IAAM,OAAO;GAAM,CAAC;GACpD,MAAM,CACJ;IACE,OAAO;IACP,OAAO;KACL,MAAM;KAGN,KAAK;gCACeC,6BAAAA,GAAG,aAAa,EAAE,WAAWC,6BAAAA,MAAM,KAAK,UAAU,EAAE;;gCAEpDD,6BAAAA,GAAG,aAAa,EAAE,iBAAiBC,6BAAAA,MAAM,KAAK,UAAU,EAAE,SAASD,6BAAAA,GAAG,WAAW,EAAE;;KAEvG,UAAU,CAAC,OAAO;IACpB;IACA,WAAW;GACb,CACF;EACF;EAEA,MAAM,gBAAgB,MAAM,GAAG,cAAc,CAC3C,MACA,uBACA,OAEA,EAAE,OAAO,KAAA,EAAU,CACrB;EAMA,MAAM,YAAY,IAAI,IAAI,SAAS,KAAK,MAAM,EAAE,QAAQ,CAAC;EACzD,KAAK,MAAM,OAAO,eAAe;GAC/B,UAAU,IAAIE,aAAAA,cAAc,MAAM,IAAI,WAAW,CAAE;GACnD,UAAU,IAAIA,aAAAA,cAAc,MAAM,IAAI,YAAY,CAAE;EACtD;EAEA,MAAM,gBAAiB,SAAS,EAAE,CAAS,WAAW;EACtD,MAAM,WAAWC,sBAAAA,iBAAiB,EAAE,CAAC,CAAC,SAAS,aAAa;EAG5D,MAAM,SAA6B,CAAC,GAAG,SAAS,CAAC,CAAC,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC;EAC9E,MAAM,SAAS,SAAS,QAAQ,aAAa;EAG7C,MAAM,MAAMA,sBAAAA,iBAAiB,EAAE;EAC/B,KAAK,MAAM,MAAM,WAAW;GAC1B,MAAM,SAAS,GAAG,UAAU,EAAE;GAC9B,IAAI,CAAC,QAAQ;GACb,MAAM,SAAS,SAAS,UAAU,YAAY,MAAM;GACpD,IAAI,qBAAqB,OAAO,UAAW,SAAS,WAAW,MAAM;GACrE,OAAgB,SAAS,UAAU,CAAC,QAAQ;EAC9C;EAGA,KAAK,MAAM,MAAM,WAAW;GAC1B,MAAM,SAAS,GAAG,UAAU,EAAE;GAC9B,IAAI,CAAC,QAAQ;GACb,IAAI,CAACC,6BAAAA,mBAAoB,OAAe,SAAS,UAAU,GAAG;IAC5D,IAAI,qBAAqB,OAAO,UAAW,SAAS,WAAW,CAAC,CAAC;IACjE,OAAgB,SAAS,UAAU,CAAC,QAAQ;GAC9C;EACF;CACF,CAAC;AACH"}

package/build/batchloaders/recursiveM2mBatchLoader.js

@@ -1,10 +1,10 @@
 import "./BatchLoader.js";
-import { kq, kqDot, kqStar } from "../keywords.js";
 import { isLoadedCollection } from "../relations/Collection.js";
+import { kq, kqDot, kqStar } from "../queries/sql/keywords.js";
 import "../relations/RecursiveCollection.js";
+import { abbreviation } from "../utils.js";
 import { deTagIds, keyToTaggedId } from "../keys.js";
 import { getMetadataForField } from "../EntityMetadata.js";
-import { abbreviation } from "../utils.js";
 import "../index.js";
 import { getEmInternalApi } from "../EntityManager.js";
 import "../Entity.js";

package/build/batchloaders/recursiveParentsBatchLoader.cjs

@@ -1,15 +1,15 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./BatchLoader.cjs");
-const require_keywords = require("../keywords.cjs");
-require("../relations/RecursiveCollection.cjs");
-const require_keys = require("../keys.cjs");
 const require_fields = require("../fields.cjs");
+const require_queries_sql_keywords = require("../queries/sql/keywords.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
+require("../relations/RecursiveCollection.cjs");
 const require_utils = require("../utils.cjs");
+const require_keys = require("../keys.cjs");
+const require_configure = require("../configure.cjs");
 require("../index.cjs");
 require("../EntityManager.cjs");
 require("../Entity.cjs");
-const require_configure = require("../configure.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
 //#region src/batchloaders/recursiveParentsBatchLoader.ts
 const recursiveParentsOperation = "m2o-recursive";
 function recursiveParentsBatchLoader(em, collection) {
@@ -44,16 +44,16 @@ function recursiveParentsBatchLoader(em, collection) {
 				query: {
 					kind: "raw",
 					sql: `
-              SELECT b.id, b.${columnName} FROM ${require_keywords.kq(meta.tableName)} b WHERE b.id = ANY(?)
+              SELECT b.id, b.${columnName} FROM ${require_queries_sql_keywords.kq(meta.tableName)} b WHERE b.id = ANY(?)
               UNION
-              SELECT r.id, r.${columnName} FROM ${require_keywords.kq(meta.tableName)} r JOIN ${alias}_cte ON r.id = ${alias}_cte.${columnName}
+              SELECT r.id, r.${columnName} FROM ${require_queries_sql_keywords.kq(meta.tableName)} r JOIN ${alias}_cte ON r.id = ${alias}_cte.${columnName}
             `,
 					bindings: [require_keys.deTagIds(meta, immediateParentIds)]
 				},
 				recursive: true
 			}]
 		};
-		require_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
+		require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
 		const rowData = await em["executeFindRowData"](meta, recursiveParentsOperation, query, {});
 		em["hydrateAndFinalize"](meta.cstr, rowData);
 	});

package/build/batchloaders/recursiveParentsBatchLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"recursiveParentsBatchLoader.cjs","names":["getMetadataForType","getField","abbreviation","kq","deTagIds"],"sources":["../../src/batchloaders/recursiveParentsBatchLoader.ts"],"sourcesContent":["import { getMetadataForType } from \"../configure.ts\";\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager } from \"../EntityManager.ts\";\nimport {\n  type ManyToOneField,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  deTagIds,\n  getField,\n  kq,\n} from \"../index.ts\";\nimport { type RecursiveParentsCollectionImpl } from \"../relations/RecursiveCollection.ts\";\nimport { abbreviation } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\n\nexport const recursiveParentsOperation = \"m2o-recursive\";\n\nexport function recursiveParentsBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: RecursiveParentsCollectionImpl<T, U>,\n): BatchLoader<Entity> {\n  let { meta, fieldName } = collection;\n  // This could be called from subtypes to get relations defined on the parent. So we need to make sure we are using the\n  // correct meta by walking the inheritance tree until we find the meta that actually has the root m2o field\n  // We intentionally don't use getMetadataForField here because CTI-specialized fields stay on the subtype metadata,\n  // while these raw recursive CTEs need the metadata/table that physically owns the FK column.\n  while (!(collection.m2oFieldName in meta.fields) && meta.baseType) meta = getMetadataForType(meta.baseType);\n  const batchKey = `${meta.tableName}-${fieldName}`;\n  return em.getBatchLoader(recursiveParentsOperation, batchKey, async (children) => {\n    const m2o = meta.allFields[collection.m2oFieldName] as ManyToOneField;\n    // ...can `getField` return a new entity? In theory, we shouldn't see new entities because\n    // RecursiveParentsCollectionImpl.load/isLoaded will see the `ManyToOneReferenceImpl` as loaded.\n    const immediateParentIds = children.map((c) => getField(c, m2o.fieldName)).filter((id: any) => id !== undefined);\n    const { columnName } = m2o.serde.columns[0];\n\n    const alias = abbreviation(meta.tableName);\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [\n        // We still select directly from our table, and join into the CTE so that we\n        // can use `addTablePerClassJoinsAndClassTag` to get inheritance added for free.\n        { alias, join: \"primary\", table: meta.tableName },\n        { alias: `${alias}_cte`, join: \"inner\", table: `${alias}_cte`, col1: `${alias}.id`, col2: `${alias}_cte.id` },\n      ],\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n      ctes: [\n        {\n          alias: `${alias}_cte`,\n          query: {\n            kind: \"raw\",\n            // b is our base case, which is the immediate parents of the children we're loading,\n            // and r is the recursive case of finding their parents.\n            sql: `\n              SELECT b.id, b.${columnName} FROM ${kq(meta.tableName)} b WHERE b.id = ANY(?)\n              UNION\n              SELECT r.id, r.${columnName} FROM ${kq(meta.tableName)} r JOIN ${alias}_cte ON r.id = ${alias}_cte.${columnName}\n            `,\n            bindings: [deTagIds(meta, immediateParentIds)],\n          },\n          recursive: true,\n        },\n      ],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n\n    const rowData = await em[\"executeFindRowData\"](meta, recursiveParentsOperation, query, {});\n\n    // Since we're preloading m2os up the tree, merely having the entities in the EM is enough\n    // for the ManyToOneReferenceImpl to find them, so we don't need to map them back to the\n    // keys, or push them into the preloader cache.\n    em[\"hydrateAndFinalize\"](meta.cstr, rowData);\n  });\n}\n"],"mappings":";;;;;;;;;;;;;AAeA,MAAa,4BAA4B;AAEzC,SAAgB,4BACd,IACA,YACqB;CACrB,IAAI,EAAE,MAAM,cAAc;CAK1B,OAAO,EAAE,WAAW,gBAAgB,KAAK,WAAW,KAAK,UAAU,OAAOA,kBAAAA,mBAAmB,KAAK,QAAQ;CAC1G,MAAM,WAAW,GAAG,KAAK,UAAU,GAAG;CACtC,OAAO,GAAG,eAAe,2BAA2B,UAAU,OAAO,aAAa;EAChF,MAAM,MAAM,KAAK,UAAU,WAAW;EAGtC,MAAM,qBAAqB,SAAS,KAAK,MAAMC,eAAAA,SAAS,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,QAAQ,OAAY,OAAO,KAAA,CAAS;EAC/G,MAAM,EAAE,eAAe,IAAI,MAAM,QAAQ;EAEzC,MAAM,QAAQC,cAAAA,aAAa,KAAK,SAAS;EACzC,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAGN;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,GAChD;IAAE,OAAO,GAAG,MAAM;IAAO,MAAM;IAAS,OAAO,GAAG,MAAM;IAAO,MAAM,GAAG,MAAM;IAAM,MAAM,GAAG,MAAM;GAAS,CAC9G;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;GAChD,MAAM,CACJ;IACE,OAAO,GAAG,MAAM;IAChB,OAAO;KACL,MAAM;KAGN,KAAK;+BACc,WAAW,QAAQC,iBAAAA,GAAG,KAAK,SAAS,EAAE;;+BAEtC,WAAW,QAAQA,iBAAAA,GAAG,KAAK,SAAS,EAAE,UAAU,MAAM,iBAAiB,MAAM,OAAO,WAAW;;KAElH,UAAU,CAACC,aAAAA,SAAS,MAAM,kBAAkB,CAAC;IAC/C;IACA,WAAW;GACb,CACF;EACF;EAEA,oBAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,2BAA2B,OAAO,CAAC,CAAC;EAKzF,GAAG,qBAAqB,CAAC,KAAK,MAAM,OAAO;CAC7C,CAAC;AACH"}
+{"version":3,"file":"recursiveParentsBatchLoader.cjs","names":["getMetadataForType","getField","abbreviation","kq","deTagIds"],"sources":["../../src/batchloaders/recursiveParentsBatchLoader.ts"],"sourcesContent":["import { getMetadataForType } from \"../configure.ts\";\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager } from \"../EntityManager.ts\";\nimport {\n  type ManyToOneField,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  deTagIds,\n  getField,\n  kq,\n} from \"../index.ts\";\nimport { type RecursiveParentsCollectionImpl } from \"../relations/RecursiveCollection.ts\";\nimport { abbreviation } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\n\nexport const recursiveParentsOperation = \"m2o-recursive\";\n\nexport function recursiveParentsBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: RecursiveParentsCollectionImpl<T, U>,\n): BatchLoader<Entity> {\n  let { meta, fieldName } = collection;\n  // This could be called from subtypes to get relations defined on the parent. So we need to make sure we are using the\n  // correct meta by walking the inheritance tree until we find the meta that actually has the root m2o field\n  // We intentionally don't use getMetadataForField here because CTI-specialized fields stay on the subtype metadata,\n  // while these raw recursive CTEs need the metadata/table that physically owns the FK column.\n  while (!(collection.m2oFieldName in meta.fields) && meta.baseType) meta = getMetadataForType(meta.baseType);\n  const batchKey = `${meta.tableName}-${fieldName}`;\n  return em.getBatchLoader(recursiveParentsOperation, batchKey, async (children) => {\n    const m2o = meta.allFields[collection.m2oFieldName] as ManyToOneField;\n    // ...can `getField` return a new entity? In theory, we shouldn't see new entities because\n    // RecursiveParentsCollectionImpl.load/isLoaded will see the `ManyToOneReferenceImpl` as loaded.\n    const immediateParentIds = children.map((c) => getField(c, m2o.fieldName)).filter((id: any) => id !== undefined);\n    const { columnName } = m2o.serde.columns[0];\n\n    const alias = abbreviation(meta.tableName);\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [\n        // We still select directly from our table, and join into the CTE so that we\n        // can use `addTablePerClassJoinsAndClassTag` to get inheritance added for free.\n        { alias, join: \"primary\", table: meta.tableName },\n        { alias: `${alias}_cte`, join: \"inner\", table: `${alias}_cte`, col1: `${alias}.id`, col2: `${alias}_cte.id` },\n      ],\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n      ctes: [\n        {\n          alias: `${alias}_cte`,\n          query: {\n            kind: \"raw\",\n            // b is our base case, which is the immediate parents of the children we're loading,\n            // and r is the recursive case of finding their parents.\n            sql: `\n              SELECT b.id, b.${columnName} FROM ${kq(meta.tableName)} b WHERE b.id = ANY(?)\n              UNION\n              SELECT r.id, r.${columnName} FROM ${kq(meta.tableName)} r JOIN ${alias}_cte ON r.id = ${alias}_cte.${columnName}\n            `,\n            bindings: [deTagIds(meta, immediateParentIds)],\n          },\n          recursive: true,\n        },\n      ],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n\n    const rowData = await em[\"executeFindRowData\"](meta, recursiveParentsOperation, query, {});\n\n    // Since we're preloading m2os up the tree, merely having the entities in the EM is enough\n    // for the ManyToOneReferenceImpl to find them, so we don't need to map them back to the\n    // keys, or push them into the preloader cache.\n    em[\"hydrateAndFinalize\"](meta.cstr, rowData);\n  });\n}\n"],"mappings":";;;;;;;;;;;;;AAeA,MAAa,4BAA4B;AAEzC,SAAgB,4BACd,IACA,YACqB;CACrB,IAAI,EAAE,MAAM,cAAc;CAK1B,OAAO,EAAE,WAAW,gBAAgB,KAAK,WAAW,KAAK,UAAU,OAAOA,kBAAAA,mBAAmB,KAAK,QAAQ;CAC1G,MAAM,WAAW,GAAG,KAAK,UAAU,GAAG;CACtC,OAAO,GAAG,eAAe,2BAA2B,UAAU,OAAO,aAAa;EAChF,MAAM,MAAM,KAAK,UAAU,WAAW;EAGtC,MAAM,qBAAqB,SAAS,KAAK,MAAMC,eAAAA,SAAS,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,QAAQ,OAAY,OAAO,KAAA,CAAS;EAC/G,MAAM,EAAE,eAAe,IAAI,MAAM,QAAQ;EAEzC,MAAM,QAAQC,cAAAA,aAAa,KAAK,SAAS;EACzC,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAGN;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,GAChD;IAAE,OAAO,GAAG,MAAM;IAAO,MAAM;IAAS,OAAO,GAAG,MAAM;IAAO,MAAM,GAAG,MAAM;IAAM,MAAM,GAAG,MAAM;GAAS,CAC9G;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;GAChD,MAAM,CACJ;IACE,OAAO,GAAG,MAAM;IAChB,OAAO;KACL,MAAM;KAGN,KAAK;+BACc,WAAW,QAAQC,6BAAAA,GAAG,KAAK,SAAS,EAAE;;+BAEtC,WAAW,QAAQA,6BAAAA,GAAG,KAAK,SAAS,EAAE,UAAU,MAAM,iBAAiB,MAAM,OAAO,WAAW;;KAElH,UAAU,CAACC,aAAAA,SAAS,MAAM,kBAAkB,CAAC;IAC/C;IACA,WAAW;GACb,CACF;EACF;EAEA,iCAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,2BAA2B,OAAO,CAAC,CAAC;EAKzF,GAAG,qBAAqB,CAAC,KAAK,MAAM,OAAO;CAC7C,CAAC;AACH"}

package/build/batchloaders/recursiveParentsBatchLoader.js

@@ -1,14 +1,14 @@
 import "./BatchLoader.js";
-import { kq } from "../keywords.js";
-import "../relations/RecursiveCollection.js";
-import { deTagIds } from "../keys.js";
 import { getField } from "../fields.js";
+import { kq } from "../queries/sql/keywords.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
+import "../relations/RecursiveCollection.js";
 import { abbreviation } from "../utils.js";
+import { deTagIds } from "../keys.js";
+import { getMetadataForType } from "../configure.js";
 import "../index.js";
 import "../EntityManager.js";
 import "../Entity.js";
-import { getMetadataForType } from "../configure.js";
-import { addTablePerClassJoinsAndClassTag } from "../QueryParser.js";
 //#region src/batchloaders/recursiveParentsBatchLoader.ts
 const recursiveParentsOperation = "m2o-recursive";
 function recursiveParentsBatchLoader(em, collection) {

package/build/changes.cjs

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("./typeMap.cjs");
+const require_fields = require("./fields.cjs");
+require("./JoinRows.cjs");
 require("./relations/EnumCollection.cjs");
 const require_relations_LazyField = require("./relations/LazyField.cjs");
-require("./JoinRows.cjs");
-const require_EntityMetadata = require("./EntityMetadata.cjs");
-const require_fields = require("./fields.cjs");
+require("./typeMap.cjs");
 const require_utils = require("./utils.cjs");
+const require_EntityMetadata = require("./EntityMetadata.cjs");
 require("./index.cjs");
 const require_EntityManager = require("./EntityManager.cjs");
 const require_Entity = require("./Entity.cjs");

package/build/changes.js

@@ -1,10 +1,10 @@
-import "./typeMap.js";
+import { getField, isChangeableField } from "./fields.js";
+import "./JoinRows.js";
 import "./relations/EnumCollection.js";
 import { notLoadedValue } from "./relations/LazyField.js";
-import "./JoinRows.js";
-import { getMetadata } from "./EntityMetadata.js";
-import { getField, isChangeableField } from "./fields.js";
+import "./typeMap.js";
 import { assertNever } from "./utils.js";
+import { getMetadata } from "./EntityMetadata.js";
 import "./index.js";
 import { getEmInternalApi, isId } from "./EntityManager.js";
 import { isEntity } from "./Entity.js";

package/build/config.cjs

@@ -1,12 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_EntityMetadata = require("./EntityMetadata.cjs");
 const require_reactiveHints = require("./reactiveHints.cjs");
 const require_utils = require("./utils.cjs");
 require("./rules.cjs");
+const require_configure = require("./configure.cjs");
+const require_EntityMetadata = require("./EntityMetadata.cjs");
+const require_defaults = require("./defaults.cjs");
 require("./index.cjs");
 require("./Entity.cjs");
-const require_defaults = require("./defaults.cjs");
-const require_configure = require("./configure.cjs");
 //#region src/config.ts
 const constraintNameToValidationError = {};
 let booted = false;

package/build/config.js

@@ -1,11 +1,11 @@
-import { getMetadata } from "./EntityMetadata.js";
 import { convertToLoadHint } from "./reactiveHints.js";
 import { fail } from "./utils.js";
 import "./rules.js";
+import { resetConstructorMap } from "./configure.js";
+import { getMetadata } from "./EntityMetadata.js";
+import { AsyncDefault } from "./defaults.js";
 import "./index.js";
 import "./Entity.js";
-import { AsyncDefault } from "./defaults.js";
-import { resetConstructorMap } from "./configure.js";
 //#region src/config.ts
 const constraintNameToValidationError = {};
 let booted = false;

package/build/configure.cjs

@@ -1,19 +1,19 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_reactiveHints = require("./reactiveHints.cjs");
+const require_utils = require("./utils.cjs");
 const require_getProperties = require("./getProperties.cjs");
 require("./relations/ReactiveField.cjs");
 const require_relations_AsyncReactiveField = require("./relations/AsyncReactiveField.cjs");
 require("./relations/index.cjs");
 const require_keys = require("./keys.cjs");
 const require_fieldSerde = require("./fieldSerde.cjs");
-const require_EntityMetadata = require("./EntityMetadata.cjs");
-const require_reactiveHints = require("./reactiveHints.cjs");
-const require_utils = require("./utils.cjs");
-const require_runtimeConfig = require("./runtimeConfig.cjs");
 const require_rules = require("./rules.cjs");
+const require_runtimeConfig = require("./runtimeConfig.cjs");
+const require_config = require("./config.cjs");
+const require_EntityMetadata = require("./EntityMetadata.cjs");
+const require_defaults = require("./defaults.cjs");
 require("./EntityManager.cjs");
 require("./Entity.cjs");
-const require_defaults = require("./defaults.cjs");
-const require_config = require("./config.cjs");
 //#region src/configure.ts
 const tagToConstructorMap = /* @__PURE__ */ new Map();
 const tableToMetaMap = /* @__PURE__ */ new Map();

package/build/configure.js

@@ -1,18 +1,18 @@
+import { reverseReactiveHint } from "./reactiveHints.js";
+import { defineLazyGetter, fail } from "./utils.js";
 import { getProperties } from "./getProperties.js";
 import "./relations/ReactiveField.js";
 import { AsyncReactiveFieldImpl } from "./relations/AsyncReactiveField.js";
 import "./relations/index.js";
 import { maybeResolveReferenceToId, setTaggedIdDelimiter, tagFromId } from "./keys.js";
 import { SimpleFieldSerde } from "./fieldSerde.js";
-import { getBaseAndSelfMetas, getBaseSelfAndSubMetas, getMetadata } from "./EntityMetadata.js";
-import { reverseReactiveHint } from "./reactiveHints.js";
-import { defineLazyGetter, fail } from "./utils.js";
-import { maybeGetRuntimeConfig } from "./runtimeConfig.js";
 import { isCannotBeUpdatedRule } from "./rules.js";
+import { maybeGetRuntimeConfig } from "./runtimeConfig.js";
+import { setAfterMetadataLocked, setBooted } from "./config.js";
+import { getBaseAndSelfMetas, getBaseSelfAndSubMetas, getMetadata } from "./EntityMetadata.js";
+import { AsyncDefault } from "./defaults.js";
 import "./EntityManager.js";
 import "./Entity.js";
-import { AsyncDefault } from "./defaults.js";
-import { setAfterMetadataLocked, setBooted } from "./config.js";
 //#region src/configure.ts
 const tagToConstructorMap = /* @__PURE__ */ new Map();
 const tableToMetaMap = /* @__PURE__ */ new Map();

package/build/dataloaders/fastWhereFilterHash.cjs

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_temporal = require("../temporal.cjs");
+const require_queries_find_Aliases = require("../queries/find/Aliases.cjs");
 const require_relations_Reference = require("../relations/Reference.cjs");
 require("../relations/index.cjs");
-const require_temporal = require("../temporal.cjs");
 const require_temporalMappers = require("../temporalMappers.cjs");
 const require_Entity = require("../Entity.cjs");
-const require_Aliases = require("../Aliases.cjs");
 //#region src/dataloaders/fastWhereFilterHash.ts
 const Temporal = require_temporal.maybeRequireTemporal()?.Temporal;
 /**
@@ -33,7 +33,7 @@ function appendStableValue(key, value, seen) {
 		case "boolean": return `${key}b${value ? 1 : 0};`;
 		case "bigint": return `${key}i${value.toString()};`;
 		case "object": return appendStableObject(key, value, seen);
-		case "function": return require_Aliases.isAlias(value) ? `${key}xalias;` : void 0;
+		case "function": return require_queries_find_Aliases.isAlias(value) ? `${key}xalias;` : void 0;
 		default: return;
 	}
 }