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

package/build/EntityMetadata.cjs

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("./fieldSerde.cjs");
 require("./loadHints.cjs");
+require("./fieldSerde.cjs");
+const require_configure = require("./configure.cjs");
+require("./config.cjs");
 require("./EntityManager.cjs");
 const require_Entity = require("./Entity.cjs");
 const require_BaseEntity = require("./BaseEntity.cjs");
-require("./config.cjs");
-const require_configure = require("./configure.cjs");
 //#region src/EntityMetadata.ts
 function getMetadata(param) {
 	if (!param) throw new Error(`Cannot getMetadata of ${param}`);

package/build/EntityMetadata.js

@@ -1,10 +1,10 @@
-import "./fieldSerde.js";
 import "./loadHints.js";
+import "./fieldSerde.js";
+import { getMetadataForType } from "./configure.js";
+import "./config.js";
 import "./EntityManager.js";
 import { isEntity } from "./Entity.js";
 import { getInstanceData } from "./BaseEntity.js";
-import "./config.js";
-import { getMetadataForType } from "./configure.js";
 //#region src/EntityMetadata.ts
 function getMetadata(param) {
 	if (!param) throw new Error(`Cannot getMetadata of ${param}`);

package/build/IndexManager.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_relations_Reference = require("./relations/Reference.cjs");
+const require_utils = require("./utils.cjs");
 require("./relations/index.cjs");
 const require_EntityMetadata = require("./EntityMetadata.cjs");
-const require_utils = require("./utils.cjs");
 const require_Entity = require("./Entity.cjs");
 //#region src/IndexManager.ts
 const emptySet = /* @__PURE__ */ new Set();

package/build/IndexManager.js

@@ -1,7 +1,7 @@
 import { isLoadedReference } from "./relations/Reference.js";
+import { groupBy } from "./utils.js";
 import "./relations/index.js";
 import { getMetadata } from "./EntityMetadata.js";
-import { groupBy } from "./utils.js";
 import { isEntity } from "./Entity.js";
 //#region src/IndexManager.ts
 const emptySet = /* @__PURE__ */ new Set();

package/build/InstanceData.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_RowData = require("./RowData.cjs");
-require("./EntityMetadata.cjs");
 const require_utils = require("./utils.cjs");
+require("./EntityMetadata.cjs");
 const require_EntityManager = require("./EntityManager.cjs");
 require("./Entity.cjs");
 //#region src/InstanceData.ts

package/build/InstanceData.js

@@ -1,6 +1,6 @@
 import { emptyRowData } from "./RowData.js";
-import "./EntityMetadata.js";
 import { hasAnyKey } from "./utils.js";
+import "./EntityMetadata.js";
 import { getEmInternalApi } from "./EntityManager.js";
 import "./Entity.js";
 //#region src/InstanceData.ts

package/build/JoinRows.cjs

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./Todo.cjs");
 require("./ReactionsManager.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_EntityManager = require("./EntityManager.cjs");
 require("./Entity.cjs");
 //#region src/JoinRows.ts

package/build/JoinRows.js

@@ -1,8 +1,8 @@
 import "./Todo.js";
 import "./ReactionsManager.js";
+import { remove } from "./utils.js";
 import { keyToNumber, keyToTaggedId } from "./keys.js";
 import { getBaseAndSelfMetas } from "./EntityMetadata.js";
-import { remove } from "./utils.js";
 import { getEmInternalApi } from "./EntityManager.js";
 import "./Entity.js";
 //#region src/JoinRows.ts

package/build/PluginManager.cjs

@@ -3,7 +3,6 @@ require("./Todo.cjs");
 require("./EntityMetadata.cjs");
 const require_EntityManager = require("./EntityManager.cjs");
 require("./Entity.cjs");
-require("./QueryParser.cjs");
 //#region src/PluginManager.ts
 const syncPluginMethods = [
 	"beforeGetField",

package/build/PluginManager.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"PluginManager.cjs","names":["isDefined","#pluginsByCallback","#plugins"],"sources":["../src/PluginManager.ts"],"sourcesContent":["import { type Entity } from \"./Entity.ts\";\nimport { type EntityManager, type FindOperation, isDefined } from \"./EntityManager.ts\";\nimport { type EntityMetadata } from \"./EntityMetadata.ts\";\nimport { type ParsedFindQuery } from \"./QueryParser.ts\";\nimport { type RowData } from \"./RowData.ts\";\nimport { type JoinRowTodo, type Todo } from \"./Todo.ts\";\n\ninterface PluginMethods {\n  /**\n   * Called before a field value is retrieved from an entity via getField.\n   *\n   * @param entity The entity instance being accessed\n   * @param field The field name being retrieved\n   */\n  beforeGetField?(entity: Entity, field: string): void;\n  /**\n   * Called before a field value is set on an entity via setField.\n   *\n   * @param entity The entity instance being modified\n   * @param field The field name being set\n   * @param newValue The new value being assigned to the field\n   */\n  beforeSetField?(entity: Entity, field: string, newValue: any): void;\n  /**\n   * Called before a find operation is executed.\n   *\n   * @param meta Metadata for the entity type being queried\n   * @param operation The type of find operation being performed\n   * @param query The parsed query conditions\n   * @param settings Query settings including limit and offset\n   */\n  beforeFind?(\n    meta: EntityMetadata,\n    operation: FindOperation,\n    query: ParsedFindQuery,\n    settings: {\n      limit?: number;\n      offset?: number;\n      allowMultipleLeftJoins?: boolean;\n      optimizeJoinsToExists?: boolean;\n      pruneJoins?: boolean;\n      keepAliases?: string[];\n    },\n  ): void;\n  /**\n   * Called after a find operation has been executed to observe the raw database rows.\n   *\n   * The result is an observation-only {@link RowData} view — i.e. `rows.rowCount` for metrics,\n   * `rows.get(i, columnName)` for specific cells, or `rows.toRows()` to materialize POJO rows.\n   * For lazy results, cells decode on access, so a hook that only counts rows costs nothing;\n   * materializing via `toRows()` decodes every cell of every row. Mutating materialized rows is\n   * unsupported and is not guaranteed to affect entity hydration.\n   *\n   * @param meta Metadata for the entity type that was queried\n   * @param operation The type of find operation that was performed\n   * @param rows A read-only view of the raw database rows returned from the query\n   */\n  afterFind?(meta: EntityMetadata, operation: FindOperation, rows: RowData): void;\n\n  beforeValidate?(entities: readonly Entity[]): Promise<void> | void;\n\n  afterValidate?(entities: readonly Entity[]): Promise<void> | void;\n\n  afterWrite(entityTodos: Record<string, Todo>, joinRowTodos: Record<string, JoinRowTodo>): void;\n}\n\nconst syncPluginMethods = [\n  \"beforeGetField\",\n  \"beforeSetField\",\n  \"beforeFind\",\n  \"afterFind\",\n  \"afterWrite\",\n] as const satisfies readonly (keyof PluginMethods)[];\nconst asyncPluginMethods = [\"beforeValidate\", \"afterValidate\"] as const satisfies readonly (keyof PluginMethods)[];\nconst emsSymbol = Symbol(\"ems\");\n/**\n * Base class for plugins that hook into entity lifecycle events.\n *\n * Plugins can implement any of the PluginMethods to intercept entity operations\n * and are automatically registered with the EntityManager when added via PluginManager.\n */\nexport abstract class Plugin {\n  // We need to store the EntityManager references in a WeakRef array so that they can be garbage collected.  If we\n  // didn't do this, then multiple EMs with the same plugin instance could keep each other from being garbage collected.\n  [emsSymbol]: WeakRef<EntityManager>[] = [];\n\n  maybeCloneForNewEm(): this | undefined {\n    return undefined;\n  }\n\n  get ems(): readonly EntityManager[] {\n    return this[emsSymbol]\n      .values()\n      .map((wr) => wr.deref())\n      .filter(isDefined)\n      .toArray();\n  }\n}\n\nexport interface Plugin extends PluginMethods {}\n\n/**\n * Manages plugin lifecycle and dispatches plugin callbacks to registered plugins.\n *\n * The PluginManager optimizes callback dispatch by only creating dispatcher methods\n * for callbacks that have at least one registered plugin, making unused plugin hooks\n * zero-cost at runtime.\n */\nexport class PluginManager implements Required<PluginMethods> {\n  #plugins = new Set<Plugin>();\n  readonly #pluginsByCallback: Partial<Record<keyof Plugin, Plugin[]>> = {};\n  constructor(public readonly em: EntityManager) {}\n\n  /** Returns whether any registered plugin implements `method`, i.e. so callers can skip building its args. */\n  hasHook(method: keyof PluginMethods): boolean {\n    return this.#pluginsByCallback[method] !== undefined;\n  }\n\n  /**\n   * Registers a plugin with this EntityManager.\n   *\n   * Dynamically creates dispatcher methods for any plugin callbacks implemented by this plugin,\n   * enabling lazy initialization of only the hooks that are actually used.\n   *\n   * @throws Error if the plugin is already registered with another EntityManager\n   */\n  addPlugin(plugin: Plugin) {\n    if (this.#plugins.has(plugin)) return; // if we're already added, then we can just early exit\n    this.#plugins.add(plugin);\n    plugin[emsSymbol].push(new WeakRef(this.em));\n    for (const method of syncPluginMethods) {\n      if (method in plugin) {\n        (this.#pluginsByCallback[method] ??= []).push(plugin);\n        // As a performance optimization, we only create the actual implementation for each method on the plugin manager\n        // once we have at least one plugin using that method. This is to make it so any unused plugin methods are\n        // effectively no-ops when called from within the em.\n        if (!Object.hasOwn(this, method)) {\n          this[method] = function (this: PluginManager, ...args: any[]) {\n            for (const plugin of this.#pluginsByCallback[method]!) {\n              (plugin[method] as (...args: any[]) => unknown)(...args);\n            }\n          };\n        }\n      }\n    }\n    for (const method of asyncPluginMethods) {\n      if (method in plugin) {\n        (this.#pluginsByCallback[method] ??= []).push(plugin);\n        // Validate-phase plugin hooks are intentionally awaited without making hot-path hooks async.\n        if (!Object.hasOwn(this, method)) {\n          this[method] = async function (this: PluginManager, ...args: any[]) {\n            for (const plugin of this.#pluginsByCallback[method]!) {\n              await (plugin[method] as (...args: any[]) => Promise<void> | void)(...args);\n            }\n          };\n        }\n      }\n    }\n  }\n\n  get plugins(): readonly Plugin[] {\n    return [...this.#plugins];\n  }\n\n  cloneTo(other: PluginManager) {\n    this.#plugins\n      .values()\n      .map((plugin) => plugin.maybeCloneForNewEm())\n      .filter(isDefined)\n      .forEach((plugin) => other.addPlugin(plugin));\n  }\n\n  // Defined as no-op functions initially instead of using optional chaining for performance reasons, see:\n  // https://adventures.nodeland.dev/archive/noop-functions-vs-optional-chaining-a-performance/\n\n  beforeGetField(entity: Entity, field: string): void {}\n  beforeSetField(entity: Entity, field: string, newValue: any): void {}\n  beforeFind(\n    meta: EntityMetadata,\n    operation: FindOperation,\n    query: ParsedFindQuery,\n    settings: {\n      limit?: number;\n      offset?: number;\n      allowMultipleLeftJoins?: boolean;\n      optimizeJoinsToExists?: boolean;\n      pruneJoins?: boolean;\n      keepAliases?: string[];\n    },\n  ): void {}\n  afterFind(meta: EntityMetadata, operation: FindOperation, rows: RowData) {}\n  beforeValidate(entities: readonly Entity[]): Promise<void> | void {}\n  afterValidate(entities: readonly Entity[]): Promise<void> | void {}\n  afterWrite(entityTodos: Record<string, Todo>, joinRowTodos: Record<string, JoinRowTodo>): void {}\n}\n"],"mappings":";;;;;;;AAkEA,MAAM,oBAAoB;CACxB;CACA;CACA;CACA;CACA;AACF;AACA,MAAM,qBAAqB,CAAC,kBAAkB,eAAe;AAC7D,MAAM,YAAY,OAAO,KAAK;;;;;;;AAO9B,IAAsB,SAAtB,MAA6B;CAG3B,CAAC,aAAuC,CAAC;CAEzC,qBAAuC,CAEvC;CAEA,IAAI,MAAgC;EAClC,OAAO,KAAK,UAAU,CACnB,OAAO,CAAC,CACR,KAAK,OAAO,GAAG,MAAM,CAAC,CAAC,CACvB,OAAOA,sBAAAA,SAAS,CAAC,CACjB,QAAQ;CACb;AACF;;;;;;;;AAWA,IAAa,gBAAb,MAA8D;CAGhC;CAF5B,2BAAW,IAAI,IAAY;CAC3B,qBAAuE,CAAC;CACxE,YAAY,IAAmC;EAAnB,KAAA,KAAA;CAAoB;;CAGhD,QAAQ,QAAsC;EAC5C,OAAO,KAAKC,mBAAmB,YAAY,KAAA;CAC7C;;;;;;;;;CAUA,UAAU,QAAgB;EACxB,IAAI,KAAKC,SAAS,IAAI,MAAM,GAAG;EAC/B,KAAKA,SAAS,IAAI,MAAM;EACxB,OAAO,UAAU,CAAC,KAAK,IAAI,QAAQ,KAAK,EAAE,CAAC;EAC3C,KAAK,MAAM,UAAU,mBACnB,IAAI,UAAU,QAAQ;GACpB,CAAC,KAAKD,mBAAmB,YAAY,CAAC,EAAA,CAAG,KAAK,MAAM;GAIpD,IAAI,CAAC,OAAO,OAAO,MAAM,MAAM,GAC7B,KAAK,UAAU,SAA+B,GAAG,MAAa;IAC5D,KAAK,MAAM,UAAU,KAAKA,mBAAmB,SAC3C,OAAQ,OAAO,CAAiC,GAAG,IAAI;GAE3D;EAEJ;EAEF,KAAK,MAAM,UAAU,oBACnB,IAAI,UAAU,QAAQ;GACpB,CAAC,KAAKA,mBAAmB,YAAY,CAAC,EAAA,CAAG,KAAK,MAAM;GAEpD,IAAI,CAAC,OAAO,OAAO,MAAM,MAAM,GAC7B,KAAK,UAAU,eAAqC,GAAG,MAAa;IAClE,KAAK,MAAM,UAAU,KAAKA,mBAAmB,SAC3C,MAAO,OAAO,OAAO,CAA8C,GAAG,IAAI;GAE9E;EAEJ;CAEJ;CAEA,IAAI,UAA6B;EAC/B,OAAO,CAAC,GAAG,KAAKC,QAAQ;CAC1B;CAEA,QAAQ,OAAsB;EAC5B,KAAKA,SACF,OAAO,CAAC,CACR,KAAK,WAAW,OAAO,mBAAmB,CAAC,CAAC,CAC5C,OAAOF,sBAAAA,SAAS,CAAC,CACjB,SAAS,WAAW,MAAM,UAAU,MAAM,CAAC;CAChD;CAKA,eAAe,QAAgB,OAAqB,CAAC;CACrD,eAAe,QAAgB,OAAe,UAAqB,CAAC;CACpE,WACE,MACA,WACA,OACA,UAQM,CAAC;CACT,UAAU,MAAsB,WAA0B,MAAe,CAAC;CAC1E,eAAe,UAAmD,CAAC;CACnE,cAAc,UAAmD,CAAC;CAClE,WAAW,aAAmC,cAAiD,CAAC;AAClG"}
+{"version":3,"file":"PluginManager.cjs","names":["isDefined","#pluginsByCallback","#plugins"],"sources":["../src/PluginManager.ts"],"sourcesContent":["import { type Entity } from \"./Entity.ts\";\nimport { type EntityManager, type FindOperation, isDefined } from \"./EntityManager.ts\";\nimport { type EntityMetadata } from \"./EntityMetadata.ts\";\nimport type { ParsedFindQuery } from \"./queries/find/QueryParser.ts\";\nimport { type RowData } from \"./RowData.ts\";\nimport { type JoinRowTodo, type Todo } from \"./Todo.ts\";\n\ninterface PluginMethods {\n  /**\n   * Called before a field value is retrieved from an entity via getField.\n   *\n   * @param entity The entity instance being accessed\n   * @param field The field name being retrieved\n   */\n  beforeGetField?(entity: Entity, field: string): void;\n  /**\n   * Called before a field value is set on an entity via setField.\n   *\n   * @param entity The entity instance being modified\n   * @param field The field name being set\n   * @param newValue The new value being assigned to the field\n   */\n  beforeSetField?(entity: Entity, field: string, newValue: any): void;\n  /**\n   * Called before a find operation is executed.\n   *\n   * @param meta Metadata for the entity type being queried\n   * @param operation The type of find operation being performed\n   * @param query The parsed query conditions\n   * @param settings Query settings including limit and offset\n   */\n  beforeFind?(\n    meta: EntityMetadata,\n    operation: FindOperation,\n    query: ParsedFindQuery,\n    settings: {\n      limit?: number;\n      offset?: number;\n      allowMultipleLeftJoins?: boolean;\n      optimizeJoinsToExists?: boolean;\n      pruneJoins?: boolean;\n      keepAliases?: string[];\n    },\n  ): void;\n  /**\n   * Called after a find operation has been executed to observe the raw database rows.\n   *\n   * The result is an observation-only {@link RowData} view — i.e. `rows.rowCount` for metrics,\n   * `rows.get(i, columnName)` for specific cells, or `rows.toRows()` to materialize POJO rows.\n   * For lazy results, cells decode on access, so a hook that only counts rows costs nothing;\n   * materializing via `toRows()` decodes every cell of every row. Mutating materialized rows is\n   * unsupported and is not guaranteed to affect entity hydration.\n   *\n   * @param meta Metadata for the entity type that was queried\n   * @param operation The type of find operation that was performed\n   * @param rows A read-only view of the raw database rows returned from the query\n   */\n  afterFind?(meta: EntityMetadata, operation: FindOperation, rows: RowData): void;\n\n  beforeValidate?(entities: readonly Entity[]): Promise<void> | void;\n\n  afterValidate?(entities: readonly Entity[]): Promise<void> | void;\n\n  afterWrite(entityTodos: Record<string, Todo>, joinRowTodos: Record<string, JoinRowTodo>): void;\n}\n\nconst syncPluginMethods = [\n  \"beforeGetField\",\n  \"beforeSetField\",\n  \"beforeFind\",\n  \"afterFind\",\n  \"afterWrite\",\n] as const satisfies readonly (keyof PluginMethods)[];\nconst asyncPluginMethods = [\"beforeValidate\", \"afterValidate\"] as const satisfies readonly (keyof PluginMethods)[];\nconst emsSymbol = Symbol(\"ems\");\n/**\n * Base class for plugins that hook into entity lifecycle events.\n *\n * Plugins can implement any of the PluginMethods to intercept entity operations\n * and are automatically registered with the EntityManager when added via PluginManager.\n */\nexport abstract class Plugin {\n  // We need to store the EntityManager references in a WeakRef array so that they can be garbage collected.  If we\n  // didn't do this, then multiple EMs with the same plugin instance could keep each other from being garbage collected.\n  [emsSymbol]: WeakRef<EntityManager>[] = [];\n\n  maybeCloneForNewEm(): this | undefined {\n    return undefined;\n  }\n\n  get ems(): readonly EntityManager[] {\n    return this[emsSymbol]\n      .values()\n      .map((wr) => wr.deref())\n      .filter(isDefined)\n      .toArray();\n  }\n}\n\nexport interface Plugin extends PluginMethods {}\n\n/**\n * Manages plugin lifecycle and dispatches plugin callbacks to registered plugins.\n *\n * The PluginManager optimizes callback dispatch by only creating dispatcher methods\n * for callbacks that have at least one registered plugin, making unused plugin hooks\n * zero-cost at runtime.\n */\nexport class PluginManager implements Required<PluginMethods> {\n  #plugins = new Set<Plugin>();\n  readonly #pluginsByCallback: Partial<Record<keyof Plugin, Plugin[]>> = {};\n  constructor(public readonly em: EntityManager) {}\n\n  /** Returns whether any registered plugin implements `method`, i.e. so callers can skip building its args. */\n  hasHook(method: keyof PluginMethods): boolean {\n    return this.#pluginsByCallback[method] !== undefined;\n  }\n\n  /**\n   * Registers a plugin with this EntityManager.\n   *\n   * Dynamically creates dispatcher methods for any plugin callbacks implemented by this plugin,\n   * enabling lazy initialization of only the hooks that are actually used.\n   *\n   * @throws Error if the plugin is already registered with another EntityManager\n   */\n  addPlugin(plugin: Plugin) {\n    if (this.#plugins.has(plugin)) return; // if we're already added, then we can just early exit\n    this.#plugins.add(plugin);\n    plugin[emsSymbol].push(new WeakRef(this.em));\n    for (const method of syncPluginMethods) {\n      if (method in plugin) {\n        (this.#pluginsByCallback[method] ??= []).push(plugin);\n        // As a performance optimization, we only create the actual implementation for each method on the plugin manager\n        // once we have at least one plugin using that method. This is to make it so any unused plugin methods are\n        // effectively no-ops when called from within the em.\n        if (!Object.hasOwn(this, method)) {\n          this[method] = function (this: PluginManager, ...args: any[]) {\n            for (const plugin of this.#pluginsByCallback[method]!) {\n              (plugin[method] as (...args: any[]) => unknown)(...args);\n            }\n          };\n        }\n      }\n    }\n    for (const method of asyncPluginMethods) {\n      if (method in plugin) {\n        (this.#pluginsByCallback[method] ??= []).push(plugin);\n        // Validate-phase plugin hooks are intentionally awaited without making hot-path hooks async.\n        if (!Object.hasOwn(this, method)) {\n          this[method] = async function (this: PluginManager, ...args: any[]) {\n            for (const plugin of this.#pluginsByCallback[method]!) {\n              await (plugin[method] as (...args: any[]) => Promise<void> | void)(...args);\n            }\n          };\n        }\n      }\n    }\n  }\n\n  get plugins(): readonly Plugin[] {\n    return [...this.#plugins];\n  }\n\n  cloneTo(other: PluginManager) {\n    this.#plugins\n      .values()\n      .map((plugin) => plugin.maybeCloneForNewEm())\n      .filter(isDefined)\n      .forEach((plugin) => other.addPlugin(plugin));\n  }\n\n  // Defined as no-op functions initially instead of using optional chaining for performance reasons, see:\n  // https://adventures.nodeland.dev/archive/noop-functions-vs-optional-chaining-a-performance/\n\n  beforeGetField(entity: Entity, field: string): void {}\n  beforeSetField(entity: Entity, field: string, newValue: any): void {}\n  beforeFind(\n    meta: EntityMetadata,\n    operation: FindOperation,\n    query: ParsedFindQuery,\n    settings: {\n      limit?: number;\n      offset?: number;\n      allowMultipleLeftJoins?: boolean;\n      optimizeJoinsToExists?: boolean;\n      pruneJoins?: boolean;\n      keepAliases?: string[];\n    },\n  ): void {}\n  afterFind(meta: EntityMetadata, operation: FindOperation, rows: RowData) {}\n  beforeValidate(entities: readonly Entity[]): Promise<void> | void {}\n  afterValidate(entities: readonly Entity[]): Promise<void> | void {}\n  afterWrite(entityTodos: Record<string, Todo>, joinRowTodos: Record<string, JoinRowTodo>): void {}\n}\n"],"mappings":";;;;;;AAkEA,MAAM,oBAAoB;CACxB;CACA;CACA;CACA;CACA;AACF;AACA,MAAM,qBAAqB,CAAC,kBAAkB,eAAe;AAC7D,MAAM,YAAY,OAAO,KAAK;;;;;;;AAO9B,IAAsB,SAAtB,MAA6B;CAG3B,CAAC,aAAuC,CAAC;CAEzC,qBAAuC,CAEvC;CAEA,IAAI,MAAgC;EAClC,OAAO,KAAK,UAAU,CACnB,OAAO,CAAC,CACR,KAAK,OAAO,GAAG,MAAM,CAAC,CAAC,CACvB,OAAOA,sBAAAA,SAAS,CAAC,CACjB,QAAQ;CACb;AACF;;;;;;;;AAWA,IAAa,gBAAb,MAA8D;CAGhC;CAF5B,2BAAW,IAAI,IAAY;CAC3B,qBAAuE,CAAC;CACxE,YAAY,IAAmC;EAAnB,KAAA,KAAA;CAAoB;;CAGhD,QAAQ,QAAsC;EAC5C,OAAO,KAAKC,mBAAmB,YAAY,KAAA;CAC7C;;;;;;;;;CAUA,UAAU,QAAgB;EACxB,IAAI,KAAKC,SAAS,IAAI,MAAM,GAAG;EAC/B,KAAKA,SAAS,IAAI,MAAM;EACxB,OAAO,UAAU,CAAC,KAAK,IAAI,QAAQ,KAAK,EAAE,CAAC;EAC3C,KAAK,MAAM,UAAU,mBACnB,IAAI,UAAU,QAAQ;GACpB,CAAC,KAAKD,mBAAmB,YAAY,CAAC,EAAA,CAAG,KAAK,MAAM;GAIpD,IAAI,CAAC,OAAO,OAAO,MAAM,MAAM,GAC7B,KAAK,UAAU,SAA+B,GAAG,MAAa;IAC5D,KAAK,MAAM,UAAU,KAAKA,mBAAmB,SAC3C,OAAQ,OAAO,CAAiC,GAAG,IAAI;GAE3D;EAEJ;EAEF,KAAK,MAAM,UAAU,oBACnB,IAAI,UAAU,QAAQ;GACpB,CAAC,KAAKA,mBAAmB,YAAY,CAAC,EAAA,CAAG,KAAK,MAAM;GAEpD,IAAI,CAAC,OAAO,OAAO,MAAM,MAAM,GAC7B,KAAK,UAAU,eAAqC,GAAG,MAAa;IAClE,KAAK,MAAM,UAAU,KAAKA,mBAAmB,SAC3C,MAAO,OAAO,OAAO,CAA8C,GAAG,IAAI;GAE9E;EAEJ;CAEJ;CAEA,IAAI,UAA6B;EAC/B,OAAO,CAAC,GAAG,KAAKC,QAAQ;CAC1B;CAEA,QAAQ,OAAsB;EAC5B,KAAKA,SACF,OAAO,CAAC,CACR,KAAK,WAAW,OAAO,mBAAmB,CAAC,CAAC,CAC5C,OAAOF,sBAAAA,SAAS,CAAC,CACjB,SAAS,WAAW,MAAM,UAAU,MAAM,CAAC;CAChD;CAKA,eAAe,QAAgB,OAAqB,CAAC;CACrD,eAAe,QAAgB,OAAe,UAAqB,CAAC;CACpE,WACE,MACA,WACA,OACA,UAQM,CAAC;CACT,UAAU,MAAsB,WAA0B,MAAe,CAAC;CAC1E,eAAe,UAAmD,CAAC;CACnE,cAAc,UAAmD,CAAC;CAClE,WAAW,aAAmC,cAAiD,CAAC;AAClG"}

package/build/PluginManager.d.cts

@@ -1,9 +1,9 @@
 import { JoinRowTodo, Todo } from "./Todo.cjs";
+import { ParsedFindQuery } from "./queries/find/QueryParser.cjs";
 import { RowData } from "./RowData.cjs";
 import { EntityMetadata } from "./EntityMetadata.cjs";
 import { EntityManager, FindOperation } from "./EntityManager.cjs";
 import { Entity } from "./Entity.cjs";
-import { ParsedFindQuery } from "./QueryParser.cjs";
 //#region src/PluginManager.d.ts
 interface PluginMethods {
   /**

package/build/PluginManager.d.mts

@@ -1,9 +1,9 @@
 import { JoinRowTodo, Todo } from "./Todo.mjs";
+import { ParsedFindQuery } from "./queries/find/QueryParser.mjs";
 import { RowData } from "./RowData.mjs";
 import { EntityMetadata } from "./EntityMetadata.mjs";
 import { EntityManager, FindOperation } from "./EntityManager.mjs";
 import { Entity } from "./Entity.mjs";
-import { ParsedFindQuery } from "./QueryParser.mjs";
 //#region src/PluginManager.d.ts
 interface PluginMethods {
   /**

package/build/PluginManager.js

@@ -2,7 +2,6 @@ import "./Todo.js";
 import "./EntityMetadata.js";
 import { isDefined } from "./EntityManager.js";
 import "./Entity.js";
-import "./QueryParser.js";
 //#region src/PluginManager.ts
 const syncPluginMethods = [
 	"beforeGetField",

package/build/PluginManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"PluginManager.js","names":["#pluginsByCallback","#plugins"],"sources":["../src/PluginManager.ts"],"sourcesContent":["import { type Entity } from \"./Entity.ts\";\nimport { type EntityManager, type FindOperation, isDefined } from \"./EntityManager.ts\";\nimport { type EntityMetadata } from \"./EntityMetadata.ts\";\nimport { type ParsedFindQuery } from \"./QueryParser.ts\";\nimport { type RowData } from \"./RowData.ts\";\nimport { type JoinRowTodo, type Todo } from \"./Todo.ts\";\n\ninterface PluginMethods {\n  /**\n   * Called before a field value is retrieved from an entity via getField.\n   *\n   * @param entity The entity instance being accessed\n   * @param field The field name being retrieved\n   */\n  beforeGetField?(entity: Entity, field: string): void;\n  /**\n   * Called before a field value is set on an entity via setField.\n   *\n   * @param entity The entity instance being modified\n   * @param field The field name being set\n   * @param newValue The new value being assigned to the field\n   */\n  beforeSetField?(entity: Entity, field: string, newValue: any): void;\n  /**\n   * Called before a find operation is executed.\n   *\n   * @param meta Metadata for the entity type being queried\n   * @param operation The type of find operation being performed\n   * @param query The parsed query conditions\n   * @param settings Query settings including limit and offset\n   */\n  beforeFind?(\n    meta: EntityMetadata,\n    operation: FindOperation,\n    query: ParsedFindQuery,\n    settings: {\n      limit?: number;\n      offset?: number;\n      allowMultipleLeftJoins?: boolean;\n      optimizeJoinsToExists?: boolean;\n      pruneJoins?: boolean;\n      keepAliases?: string[];\n    },\n  ): void;\n  /**\n   * Called after a find operation has been executed to observe the raw database rows.\n   *\n   * The result is an observation-only {@link RowData} view — i.e. `rows.rowCount` for metrics,\n   * `rows.get(i, columnName)` for specific cells, or `rows.toRows()` to materialize POJO rows.\n   * For lazy results, cells decode on access, so a hook that only counts rows costs nothing;\n   * materializing via `toRows()` decodes every cell of every row. Mutating materialized rows is\n   * unsupported and is not guaranteed to affect entity hydration.\n   *\n   * @param meta Metadata for the entity type that was queried\n   * @param operation The type of find operation that was performed\n   * @param rows A read-only view of the raw database rows returned from the query\n   */\n  afterFind?(meta: EntityMetadata, operation: FindOperation, rows: RowData): void;\n\n  beforeValidate?(entities: readonly Entity[]): Promise<void> | void;\n\n  afterValidate?(entities: readonly Entity[]): Promise<void> | void;\n\n  afterWrite(entityTodos: Record<string, Todo>, joinRowTodos: Record<string, JoinRowTodo>): void;\n}\n\nconst syncPluginMethods = [\n  \"beforeGetField\",\n  \"beforeSetField\",\n  \"beforeFind\",\n  \"afterFind\",\n  \"afterWrite\",\n] as const satisfies readonly (keyof PluginMethods)[];\nconst asyncPluginMethods = [\"beforeValidate\", \"afterValidate\"] as const satisfies readonly (keyof PluginMethods)[];\nconst emsSymbol = Symbol(\"ems\");\n/**\n * Base class for plugins that hook into entity lifecycle events.\n *\n * Plugins can implement any of the PluginMethods to intercept entity operations\n * and are automatically registered with the EntityManager when added via PluginManager.\n */\nexport abstract class Plugin {\n  // We need to store the EntityManager references in a WeakRef array so that they can be garbage collected.  If we\n  // didn't do this, then multiple EMs with the same plugin instance could keep each other from being garbage collected.\n  [emsSymbol]: WeakRef<EntityManager>[] = [];\n\n  maybeCloneForNewEm(): this | undefined {\n    return undefined;\n  }\n\n  get ems(): readonly EntityManager[] {\n    return this[emsSymbol]\n      .values()\n      .map((wr) => wr.deref())\n      .filter(isDefined)\n      .toArray();\n  }\n}\n\nexport interface Plugin extends PluginMethods {}\n\n/**\n * Manages plugin lifecycle and dispatches plugin callbacks to registered plugins.\n *\n * The PluginManager optimizes callback dispatch by only creating dispatcher methods\n * for callbacks that have at least one registered plugin, making unused plugin hooks\n * zero-cost at runtime.\n */\nexport class PluginManager implements Required<PluginMethods> {\n  #plugins = new Set<Plugin>();\n  readonly #pluginsByCallback: Partial<Record<keyof Plugin, Plugin[]>> = {};\n  constructor(public readonly em: EntityManager) {}\n\n  /** Returns whether any registered plugin implements `method`, i.e. so callers can skip building its args. */\n  hasHook(method: keyof PluginMethods): boolean {\n    return this.#pluginsByCallback[method] !== undefined;\n  }\n\n  /**\n   * Registers a plugin with this EntityManager.\n   *\n   * Dynamically creates dispatcher methods for any plugin callbacks implemented by this plugin,\n   * enabling lazy initialization of only the hooks that are actually used.\n   *\n   * @throws Error if the plugin is already registered with another EntityManager\n   */\n  addPlugin(plugin: Plugin) {\n    if (this.#plugins.has(plugin)) return; // if we're already added, then we can just early exit\n    this.#plugins.add(plugin);\n    plugin[emsSymbol].push(new WeakRef(this.em));\n    for (const method of syncPluginMethods) {\n      if (method in plugin) {\n        (this.#pluginsByCallback[method] ??= []).push(plugin);\n        // As a performance optimization, we only create the actual implementation for each method on the plugin manager\n        // once we have at least one plugin using that method. This is to make it so any unused plugin methods are\n        // effectively no-ops when called from within the em.\n        if (!Object.hasOwn(this, method)) {\n          this[method] = function (this: PluginManager, ...args: any[]) {\n            for (const plugin of this.#pluginsByCallback[method]!) {\n              (plugin[method] as (...args: any[]) => unknown)(...args);\n            }\n          };\n        }\n      }\n    }\n    for (const method of asyncPluginMethods) {\n      if (method in plugin) {\n        (this.#pluginsByCallback[method] ??= []).push(plugin);\n        // Validate-phase plugin hooks are intentionally awaited without making hot-path hooks async.\n        if (!Object.hasOwn(this, method)) {\n          this[method] = async function (this: PluginManager, ...args: any[]) {\n            for (const plugin of this.#pluginsByCallback[method]!) {\n              await (plugin[method] as (...args: any[]) => Promise<void> | void)(...args);\n            }\n          };\n        }\n      }\n    }\n  }\n\n  get plugins(): readonly Plugin[] {\n    return [...this.#plugins];\n  }\n\n  cloneTo(other: PluginManager) {\n    this.#plugins\n      .values()\n      .map((plugin) => plugin.maybeCloneForNewEm())\n      .filter(isDefined)\n      .forEach((plugin) => other.addPlugin(plugin));\n  }\n\n  // Defined as no-op functions initially instead of using optional chaining for performance reasons, see:\n  // https://adventures.nodeland.dev/archive/noop-functions-vs-optional-chaining-a-performance/\n\n  beforeGetField(entity: Entity, field: string): void {}\n  beforeSetField(entity: Entity, field: string, newValue: any): void {}\n  beforeFind(\n    meta: EntityMetadata,\n    operation: FindOperation,\n    query: ParsedFindQuery,\n    settings: {\n      limit?: number;\n      offset?: number;\n      allowMultipleLeftJoins?: boolean;\n      optimizeJoinsToExists?: boolean;\n      pruneJoins?: boolean;\n      keepAliases?: string[];\n    },\n  ): void {}\n  afterFind(meta: EntityMetadata, operation: FindOperation, rows: RowData) {}\n  beforeValidate(entities: readonly Entity[]): Promise<void> | void {}\n  afterValidate(entities: readonly Entity[]): Promise<void> | void {}\n  afterWrite(entityTodos: Record<string, Todo>, joinRowTodos: Record<string, JoinRowTodo>): void {}\n}\n"],"mappings":";;;;;;AAkEA,MAAM,oBAAoB;CACxB;CACA;CACA;CACA;CACA;AACF;AACA,MAAM,qBAAqB,CAAC,kBAAkB,eAAe;AAC7D,MAAM,YAAY,OAAO,KAAK;;;;;;;AAO9B,IAAsB,SAAtB,MAA6B;CAG3B,CAAC,aAAuC,CAAC;CAEzC,qBAAuC,CAEvC;CAEA,IAAI,MAAgC;EAClC,OAAO,KAAK,UAAU,CACnB,OAAO,CAAC,CACR,KAAK,OAAO,GAAG,MAAM,CAAC,CAAC,CACvB,OAAO,SAAS,CAAC,CACjB,QAAQ;CACb;AACF;;;;;;;;AAWA,IAAa,gBAAb,MAA8D;CAGhC;CAF5B,2BAAW,IAAI,IAAY;CAC3B,qBAAuE,CAAC;CACxE,YAAY,IAAmC;EAAnB,KAAA,KAAA;CAAoB;;CAGhD,QAAQ,QAAsC;EAC5C,OAAO,KAAKA,mBAAmB,YAAY,KAAA;CAC7C;;;;;;;;;CAUA,UAAU,QAAgB;EACxB,IAAI,KAAKC,SAAS,IAAI,MAAM,GAAG;EAC/B,KAAKA,SAAS,IAAI,MAAM;EACxB,OAAO,UAAU,CAAC,KAAK,IAAI,QAAQ,KAAK,EAAE,CAAC;EAC3C,KAAK,MAAM,UAAU,mBACnB,IAAI,UAAU,QAAQ;GACpB,CAAC,KAAKD,mBAAmB,YAAY,CAAC,EAAA,CAAG,KAAK,MAAM;GAIpD,IAAI,CAAC,OAAO,OAAO,MAAM,MAAM,GAC7B,KAAK,UAAU,SAA+B,GAAG,MAAa;IAC5D,KAAK,MAAM,UAAU,KAAKA,mBAAmB,SAC3C,OAAQ,OAAO,CAAiC,GAAG,IAAI;GAE3D;EAEJ;EAEF,KAAK,MAAM,UAAU,oBACnB,IAAI,UAAU,QAAQ;GACpB,CAAC,KAAKA,mBAAmB,YAAY,CAAC,EAAA,CAAG,KAAK,MAAM;GAEpD,IAAI,CAAC,OAAO,OAAO,MAAM,MAAM,GAC7B,KAAK,UAAU,eAAqC,GAAG,MAAa;IAClE,KAAK,MAAM,UAAU,KAAKA,mBAAmB,SAC3C,MAAO,OAAO,OAAO,CAA8C,GAAG,IAAI;GAE9E;EAEJ;CAEJ;CAEA,IAAI,UAA6B;EAC/B,OAAO,CAAC,GAAG,KAAKC,QAAQ;CAC1B;CAEA,QAAQ,OAAsB;EAC5B,KAAKA,SACF,OAAO,CAAC,CACR,KAAK,WAAW,OAAO,mBAAmB,CAAC,CAAC,CAC5C,OAAO,SAAS,CAAC,CACjB,SAAS,WAAW,MAAM,UAAU,MAAM,CAAC;CAChD;CAKA,eAAe,QAAgB,OAAqB,CAAC;CACrD,eAAe,QAAgB,OAAe,UAAqB,CAAC;CACpE,WACE,MACA,WACA,OACA,UAQM,CAAC;CACT,UAAU,MAAsB,WAA0B,MAAe,CAAC;CAC1E,eAAe,UAAmD,CAAC;CACnE,cAAc,UAAmD,CAAC;CAClE,WAAW,aAAmC,cAAiD,CAAC;AAClG"}
+{"version":3,"file":"PluginManager.js","names":["#pluginsByCallback","#plugins"],"sources":["../src/PluginManager.ts"],"sourcesContent":["import { type Entity } from \"./Entity.ts\";\nimport { type EntityManager, type FindOperation, isDefined } from \"./EntityManager.ts\";\nimport { type EntityMetadata } from \"./EntityMetadata.ts\";\nimport type { ParsedFindQuery } from \"./queries/find/QueryParser.ts\";\nimport { type RowData } from \"./RowData.ts\";\nimport { type JoinRowTodo, type Todo } from \"./Todo.ts\";\n\ninterface PluginMethods {\n  /**\n   * Called before a field value is retrieved from an entity via getField.\n   *\n   * @param entity The entity instance being accessed\n   * @param field The field name being retrieved\n   */\n  beforeGetField?(entity: Entity, field: string): void;\n  /**\n   * Called before a field value is set on an entity via setField.\n   *\n   * @param entity The entity instance being modified\n   * @param field The field name being set\n   * @param newValue The new value being assigned to the field\n   */\n  beforeSetField?(entity: Entity, field: string, newValue: any): void;\n  /**\n   * Called before a find operation is executed.\n   *\n   * @param meta Metadata for the entity type being queried\n   * @param operation The type of find operation being performed\n   * @param query The parsed query conditions\n   * @param settings Query settings including limit and offset\n   */\n  beforeFind?(\n    meta: EntityMetadata,\n    operation: FindOperation,\n    query: ParsedFindQuery,\n    settings: {\n      limit?: number;\n      offset?: number;\n      allowMultipleLeftJoins?: boolean;\n      optimizeJoinsToExists?: boolean;\n      pruneJoins?: boolean;\n      keepAliases?: string[];\n    },\n  ): void;\n  /**\n   * Called after a find operation has been executed to observe the raw database rows.\n   *\n   * The result is an observation-only {@link RowData} view — i.e. `rows.rowCount` for metrics,\n   * `rows.get(i, columnName)` for specific cells, or `rows.toRows()` to materialize POJO rows.\n   * For lazy results, cells decode on access, so a hook that only counts rows costs nothing;\n   * materializing via `toRows()` decodes every cell of every row. Mutating materialized rows is\n   * unsupported and is not guaranteed to affect entity hydration.\n   *\n   * @param meta Metadata for the entity type that was queried\n   * @param operation The type of find operation that was performed\n   * @param rows A read-only view of the raw database rows returned from the query\n   */\n  afterFind?(meta: EntityMetadata, operation: FindOperation, rows: RowData): void;\n\n  beforeValidate?(entities: readonly Entity[]): Promise<void> | void;\n\n  afterValidate?(entities: readonly Entity[]): Promise<void> | void;\n\n  afterWrite(entityTodos: Record<string, Todo>, joinRowTodos: Record<string, JoinRowTodo>): void;\n}\n\nconst syncPluginMethods = [\n  \"beforeGetField\",\n  \"beforeSetField\",\n  \"beforeFind\",\n  \"afterFind\",\n  \"afterWrite\",\n] as const satisfies readonly (keyof PluginMethods)[];\nconst asyncPluginMethods = [\"beforeValidate\", \"afterValidate\"] as const satisfies readonly (keyof PluginMethods)[];\nconst emsSymbol = Symbol(\"ems\");\n/**\n * Base class for plugins that hook into entity lifecycle events.\n *\n * Plugins can implement any of the PluginMethods to intercept entity operations\n * and are automatically registered with the EntityManager when added via PluginManager.\n */\nexport abstract class Plugin {\n  // We need to store the EntityManager references in a WeakRef array so that they can be garbage collected.  If we\n  // didn't do this, then multiple EMs with the same plugin instance could keep each other from being garbage collected.\n  [emsSymbol]: WeakRef<EntityManager>[] = [];\n\n  maybeCloneForNewEm(): this | undefined {\n    return undefined;\n  }\n\n  get ems(): readonly EntityManager[] {\n    return this[emsSymbol]\n      .values()\n      .map((wr) => wr.deref())\n      .filter(isDefined)\n      .toArray();\n  }\n}\n\nexport interface Plugin extends PluginMethods {}\n\n/**\n * Manages plugin lifecycle and dispatches plugin callbacks to registered plugins.\n *\n * The PluginManager optimizes callback dispatch by only creating dispatcher methods\n * for callbacks that have at least one registered plugin, making unused plugin hooks\n * zero-cost at runtime.\n */\nexport class PluginManager implements Required<PluginMethods> {\n  #plugins = new Set<Plugin>();\n  readonly #pluginsByCallback: Partial<Record<keyof Plugin, Plugin[]>> = {};\n  constructor(public readonly em: EntityManager) {}\n\n  /** Returns whether any registered plugin implements `method`, i.e. so callers can skip building its args. */\n  hasHook(method: keyof PluginMethods): boolean {\n    return this.#pluginsByCallback[method] !== undefined;\n  }\n\n  /**\n   * Registers a plugin with this EntityManager.\n   *\n   * Dynamically creates dispatcher methods for any plugin callbacks implemented by this plugin,\n   * enabling lazy initialization of only the hooks that are actually used.\n   *\n   * @throws Error if the plugin is already registered with another EntityManager\n   */\n  addPlugin(plugin: Plugin) {\n    if (this.#plugins.has(plugin)) return; // if we're already added, then we can just early exit\n    this.#plugins.add(plugin);\n    plugin[emsSymbol].push(new WeakRef(this.em));\n    for (const method of syncPluginMethods) {\n      if (method in plugin) {\n        (this.#pluginsByCallback[method] ??= []).push(plugin);\n        // As a performance optimization, we only create the actual implementation for each method on the plugin manager\n        // once we have at least one plugin using that method. This is to make it so any unused plugin methods are\n        // effectively no-ops when called from within the em.\n        if (!Object.hasOwn(this, method)) {\n          this[method] = function (this: PluginManager, ...args: any[]) {\n            for (const plugin of this.#pluginsByCallback[method]!) {\n              (plugin[method] as (...args: any[]) => unknown)(...args);\n            }\n          };\n        }\n      }\n    }\n    for (const method of asyncPluginMethods) {\n      if (method in plugin) {\n        (this.#pluginsByCallback[method] ??= []).push(plugin);\n        // Validate-phase plugin hooks are intentionally awaited without making hot-path hooks async.\n        if (!Object.hasOwn(this, method)) {\n          this[method] = async function (this: PluginManager, ...args: any[]) {\n            for (const plugin of this.#pluginsByCallback[method]!) {\n              await (plugin[method] as (...args: any[]) => Promise<void> | void)(...args);\n            }\n          };\n        }\n      }\n    }\n  }\n\n  get plugins(): readonly Plugin[] {\n    return [...this.#plugins];\n  }\n\n  cloneTo(other: PluginManager) {\n    this.#plugins\n      .values()\n      .map((plugin) => plugin.maybeCloneForNewEm())\n      .filter(isDefined)\n      .forEach((plugin) => other.addPlugin(plugin));\n  }\n\n  // Defined as no-op functions initially instead of using optional chaining for performance reasons, see:\n  // https://adventures.nodeland.dev/archive/noop-functions-vs-optional-chaining-a-performance/\n\n  beforeGetField(entity: Entity, field: string): void {}\n  beforeSetField(entity: Entity, field: string, newValue: any): void {}\n  beforeFind(\n    meta: EntityMetadata,\n    operation: FindOperation,\n    query: ParsedFindQuery,\n    settings: {\n      limit?: number;\n      offset?: number;\n      allowMultipleLeftJoins?: boolean;\n      optimizeJoinsToExists?: boolean;\n      pruneJoins?: boolean;\n      keepAliases?: string[];\n    },\n  ): void {}\n  afterFind(meta: EntityMetadata, operation: FindOperation, rows: RowData) {}\n  beforeValidate(entities: readonly Entity[]): Promise<void> | void {}\n  afterValidate(entities: readonly Entity[]): Promise<void> | void {}\n  afterWrite(entityTodos: Record<string, Todo>, joinRowTodos: Record<string, JoinRowTodo>): void {}\n}\n"],"mappings":";;;;;AAkEA,MAAM,oBAAoB;CACxB;CACA;CACA;CACA;CACA;AACF;AACA,MAAM,qBAAqB,CAAC,kBAAkB,eAAe;AAC7D,MAAM,YAAY,OAAO,KAAK;;;;;;;AAO9B,IAAsB,SAAtB,MAA6B;CAG3B,CAAC,aAAuC,CAAC;CAEzC,qBAAuC,CAEvC;CAEA,IAAI,MAAgC;EAClC,OAAO,KAAK,UAAU,CACnB,OAAO,CAAC,CACR,KAAK,OAAO,GAAG,MAAM,CAAC,CAAC,CACvB,OAAO,SAAS,CAAC,CACjB,QAAQ;CACb;AACF;;;;;;;;AAWA,IAAa,gBAAb,MAA8D;CAGhC;CAF5B,2BAAW,IAAI,IAAY;CAC3B,qBAAuE,CAAC;CACxE,YAAY,IAAmC;EAAnB,KAAA,KAAA;CAAoB;;CAGhD,QAAQ,QAAsC;EAC5C,OAAO,KAAKA,mBAAmB,YAAY,KAAA;CAC7C;;;;;;;;;CAUA,UAAU,QAAgB;EACxB,IAAI,KAAKC,SAAS,IAAI,MAAM,GAAG;EAC/B,KAAKA,SAAS,IAAI,MAAM;EACxB,OAAO,UAAU,CAAC,KAAK,IAAI,QAAQ,KAAK,EAAE,CAAC;EAC3C,KAAK,MAAM,UAAU,mBACnB,IAAI,UAAU,QAAQ;GACpB,CAAC,KAAKD,mBAAmB,YAAY,CAAC,EAAA,CAAG,KAAK,MAAM;GAIpD,IAAI,CAAC,OAAO,OAAO,MAAM,MAAM,GAC7B,KAAK,UAAU,SAA+B,GAAG,MAAa;IAC5D,KAAK,MAAM,UAAU,KAAKA,mBAAmB,SAC3C,OAAQ,OAAO,CAAiC,GAAG,IAAI;GAE3D;EAEJ;EAEF,KAAK,MAAM,UAAU,oBACnB,IAAI,UAAU,QAAQ;GACpB,CAAC,KAAKA,mBAAmB,YAAY,CAAC,EAAA,CAAG,KAAK,MAAM;GAEpD,IAAI,CAAC,OAAO,OAAO,MAAM,MAAM,GAC7B,KAAK,UAAU,eAAqC,GAAG,MAAa;IAClE,KAAK,MAAM,UAAU,KAAKA,mBAAmB,SAC3C,MAAO,OAAO,OAAO,CAA8C,GAAG,IAAI;GAE9E;EAEJ;CAEJ;CAEA,IAAI,UAA6B;EAC/B,OAAO,CAAC,GAAG,KAAKC,QAAQ;CAC1B;CAEA,QAAQ,OAAsB;EAC5B,KAAKA,SACF,OAAO,CAAC,CACR,KAAK,WAAW,OAAO,mBAAmB,CAAC,CAAC,CAC5C,OAAO,SAAS,CAAC,CACjB,SAAS,WAAW,MAAM,UAAU,MAAM,CAAC;CAChD;CAKA,eAAe,QAAgB,OAAqB,CAAC;CACrD,eAAe,QAAgB,OAAe,UAAqB,CAAC;CACpE,WACE,MACA,WACA,OACA,UAQM,CAAC;CACT,UAAU,MAAsB,WAA0B,MAAe,CAAC;CAC1E,eAAe,UAAmD,CAAC;CACnE,cAAc,UAAmD,CAAC;CAClE,WAAW,aAAmC,cAAiD,CAAC;AAClG"}

package/build/ReactionsManager.cjs

@@ -1,12 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_logging_ReactionLogger = require("./logging/ReactionLogger.cjs");
 const require_trusted = require("./trusted.cjs");
-const require_EntityMetadata = require("./EntityMetadata.cjs");
 const require_reactiveHints = require("./reactiveHints.cjs");
+require("./config.cjs");
+const require_EntityMetadata = require("./EntityMetadata.cjs");
 const require_index = require("./index.cjs");
 const require_EntityManager = require("./EntityManager.cjs");
 require("./Entity.cjs");
-require("./config.cjs");
 //#region src/ReactionsManager.ts
 /**
 * Manages the reactivity of tracking which source fields have changed and finding/recalculating

package/build/ReactionsManager.js

@@ -1,11 +1,11 @@
 import { globalLogger, noopReactionLogger } from "./logging/ReactionLogger.js";
 import { runInTrustedContext } from "./trusted.js";
-import { getMetadata } from "./EntityMetadata.js";
 import { followReverseHint } from "./reactiveHints.js";
+import "./config.js";
+import { getMetadata } from "./EntityMetadata.js";
 import { NoIdError } from "./index.js";
 import { getEmInternalApi } from "./EntityManager.js";
 import "./Entity.js";
-import "./config.js";
 //#region src/ReactionsManager.ts
 /**
 * Manages the reactivity of tracking which source fields have changed and finding/recalculating

package/build/Todo.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./JoinRows.cjs");
-const require_EntityMetadata = require("./EntityMetadata.cjs");
 const require_utils = require("./utils.cjs");
+const require_EntityMetadata = require("./EntityMetadata.cjs");
 require("./Entity.cjs");
 const require_BaseEntity = require("./BaseEntity.cjs");
 //#region src/Todo.ts

package/build/Todo.js

@@ -1,6 +1,6 @@
 import "./JoinRows.js";
-import { getMetadata } from "./EntityMetadata.js";
 import { groupBy } from "./utils.js";
+import { getMetadata } from "./EntityMetadata.js";
 import "./Entity.js";
 import { getInstanceData } from "./BaseEntity.js";
 //#region src/Todo.ts

package/build/batchloaders/enumCollectionBatchLoader.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./BatchLoader.cjs");
-const require_keys = require("../keys.cjs");
 const require_utils = require("../utils.cjs");
+const require_keys = require("../keys.cjs");
 require("../index.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
 //#region src/batchloaders/enumCollectionBatchLoader.ts

package/build/batchloaders/enumCollectionBatchLoader.js

@@ -1,6 +1,6 @@
 import "./BatchLoader.js";
-import { keyToNumber } from "../keys.js";
 import { abbreviation } from "../utils.js";
+import { keyToNumber } from "../keys.js";
 import "../index.js";
 import { getEmInternalApi } from "../EntityManager.js";
 //#region src/batchloaders/enumCollectionBatchLoader.ts

package/build/batchloaders/loadBatchLoader.cjs

@@ -1,13 +1,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./BatchLoader.cjs");
-const require_keys = require("../keys.cjs");
-require("../EntityMetadata.cjs");
+const require_queries_entityQueryUtils = require("../queries/entityQueryUtils.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
 require("../loadHints.cjs");
 const require_utils = require("../utils.cjs");
+const require_keys = require("../keys.cjs");
+require("../EntityMetadata.cjs");
 const require_HintTree = require("../HintTree.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
 const require_BaseEntity = require("../BaseEntity.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
 //#region src/batchloaders/loadBatchLoader.ts
 const loadOperation = "load";
 /**
@@ -22,7 +23,7 @@ function loadBatchLoader(em, meta, overwriteExisting = false) {
 		const keys = loads.map((l) => require_keys.keyToNumber(meta, l.taggedId));
 		const alias = require_utils.abbreviation(meta.tableName);
 		const query = {
-			selects: meta.hasLazyColumns ? require_QueryParser.lazyExcludedSelects(meta, alias) : [`"${alias}".*`],
+			selects: meta.hasLazyColumns ? require_queries_entityQueryUtils.lazyExcludedSelects(meta, alias) : [`"${alias}".*`],
 			tables: [{
 				alias,
 				join: "primary",
@@ -48,7 +49,7 @@ function loadBatchLoader(em, meta, overwriteExisting = false) {
 				order: "ASC"
 			}]
 		};
-		require_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
+		require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
 		const { preloader } = require_EntityManager.getEmInternalApi(em);
 		const preloadHydrator = preloader && preloader.addPreloading(meta, require_HintTree.buildHintTree(loads.map((l) => ({
 			entity: l.taggedId,

package/build/batchloaders/loadBatchLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"loadBatchLoader.cjs","names":["keyToNumber","abbreviation","lazyExcludedSelects","getEmInternalApi","buildHintTree","tagId"],"sources":["../../src/batchloaders/loadBatchLoader.ts"],"sourcesContent":["import { getInstanceData } from \"../BaseEntity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"../EntityManager.ts\";\nimport { type EntityMetadata } from \"../EntityMetadata.ts\";\nimport { buildHintTree } from \"../HintTree.ts\";\nimport { keyToNumber, tagId } from \"../keys.ts\";\nimport { type LoadHint } from \"../loadHints.ts\";\nimport { type ParsedFindQuery, addTablePerClassJoinsAndClassTag, lazyExcludedSelects } from \"../QueryParser.ts\";\nimport { abbreviation } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\n\nexport const loadOperation = \"load\";\n\n/**\n * Batches em.load-style fetches, writing to identity map (via hydrate) instead of returning values.\n * After the batch resolves, callers retrieve their entity from `em.findExistingInstance`.\n *\n * Accepts tuples of `{ taggedId, hint }` so the preloader can inject join-based\n * preloading into the same SELECT that fetches the entities.\n */\nexport function loadBatchLoader(\n  em: EntityManager,\n  meta: EntityMetadata,\n  overwriteExisting: boolean = false,\n): BatchLoader<{ taggedId: string; hint: LoadHint<any> | undefined }> {\n  return em.getBatchLoader(loadOperation, `${meta.type}-${overwriteExisting}`, async (loads) => {\n    const keys = loads.map((l) => keyToNumber(meta, l.taggedId));\n    const alias = abbreviation(meta.tableName);\n    const query = {\n      selects: meta.hasLazyColumns ? lazyExcludedSelects(meta, alias) : [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: {\n        kind: \"exp\",\n        op: \"and\",\n        conditions: [{ kind: \"column\", alias, column: \"id\", dbType: meta.idDbType, cond: { kind: \"in\", value: keys } }],\n      },\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n    } satisfies ParsedFindQuery;\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n    // Inject preloading joins into the query if enabled\n    const { preloader } = getEmInternalApi(em);\n    const preloadHydrator =\n      preloader &&\n      preloader.addPreloading(meta, buildHintTree(loads.map((l) => ({ entity: l.taggedId, hint: l.hint }))), query);\n    const rowData = await em[\"executeFindRowData\"](meta, loadOperation, query, {});\n    em[\"hydrateAndFinalize\"](meta.cstr, rowData, {\n      overwriteExisting,\n      sidecars: (entities) => {\n        preloadHydrator && preloadHydrator(rowData, entities);\n        // If we're missing any requested rows, mark any requested-but-not-found entities as deleted\n        if (rowData.rowCount !== loads.length) {\n          const foundIds = new Set<string>();\n          for (let i = 0; i < rowData.rowCount; i++) foundIds.add(tagId(meta, rowData.get(i, \"id\")));\n          for (const load of loads) {\n            if (!foundIds.has(load.taggedId)) {\n              const existingEntity = em.findExistingInstance(load.taggedId);\n              if (existingEntity) {\n                getInstanceData(existingEntity).markDeletedBecauseNotFound();\n              }\n            }\n          }\n        }\n      },\n    });\n  });\n}\n"],"mappings":";;;;;;;;;;;AAUA,MAAa,gBAAgB;;;;;;;;AAS7B,SAAgB,gBACd,IACA,MACA,oBAA6B,OACuC;CACpE,OAAO,GAAG,eAAe,eAAe,GAAG,KAAK,KAAK,GAAG,qBAAqB,OAAO,UAAU;EAC5F,MAAM,OAAO,MAAM,KAAK,MAAMA,aAAAA,YAAY,MAAM,EAAE,QAAQ,CAAC;EAC3D,MAAM,QAAQC,cAAAA,aAAa,KAAK,SAAS;EACzC,MAAM,QAAQ;GACZ,SAAS,KAAK,iBAAiBC,oBAAAA,oBAAoB,MAAM,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI;GACjF,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,CAAC;KAAE,MAAM;KAAU;KAAO,QAAQ;KAAM,QAAQ,KAAK;KAAU,MAAM;MAAE,MAAM;MAAM,OAAO;KAAK;IAAE,CAAC;GAChH;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;EAClD;EACA,oBAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,EAAE,cAAcC,sBAAAA,iBAAiB,EAAE;EACzC,MAAM,kBACJ,aACA,UAAU,cAAc,MAAMC,iBAAAA,cAAc,MAAM,KAAK,OAAO;GAAE,QAAQ,EAAE;GAAU,MAAM,EAAE;EAAK,EAAE,CAAC,GAAG,KAAK;EAC9G,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,eAAe,OAAO,CAAC,CAAC;EAC7E,GAAG,qBAAqB,CAAC,KAAK,MAAM,SAAS;GAC3C;GACA,WAAW,aAAa;IACtB,mBAAmB,gBAAgB,SAAS,QAAQ;IAEpD,IAAI,QAAQ,aAAa,MAAM,QAAQ;KACrC,MAAM,2BAAW,IAAI,IAAY;KACjC,KAAK,IAAI,IAAI,GAAG,IAAI,QAAQ,UAAU,KAAK,SAAS,IAAIC,aAAAA,MAAM,MAAM,QAAQ,IAAI,GAAG,IAAI,CAAC,CAAC;KACzF,KAAK,MAAM,QAAQ,OACjB,IAAI,CAAC,SAAS,IAAI,KAAK,QAAQ,GAAG;MAChC,MAAM,iBAAiB,GAAG,qBAAqB,KAAK,QAAQ;MAC5D,IAAI,gBACF,mBAAA,gBAAgB,cAAc,CAAC,CAAC,2BAA2B;KAE/D;IAEJ;GACF;EACF,CAAC;CACH,CAAC;AACH"}
+{"version":3,"file":"loadBatchLoader.cjs","names":["keyToNumber","abbreviation","lazyExcludedSelects","getEmInternalApi","buildHintTree","tagId"],"sources":["../../src/batchloaders/loadBatchLoader.ts"],"sourcesContent":["import { getInstanceData } from \"../BaseEntity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"../EntityManager.ts\";\nimport { type EntityMetadata } from \"../EntityMetadata.ts\";\nimport { buildHintTree } from \"../HintTree.ts\";\nimport { keyToNumber, tagId } from \"../keys.ts\";\nimport { type LoadHint } from \"../loadHints.ts\";\nimport { lazyExcludedSelects } from \"../queries/entityQueryUtils.ts\";\nimport { type ParsedFindQuery, addTablePerClassJoinsAndClassTag } from \"../queries/find/QueryParser.ts\";\nimport { abbreviation } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\n\nexport const loadOperation = \"load\";\n\n/**\n * Batches em.load-style fetches, writing to identity map (via hydrate) instead of returning values.\n * After the batch resolves, callers retrieve their entity from `em.findExistingInstance`.\n *\n * Accepts tuples of `{ taggedId, hint }` so the preloader can inject join-based\n * preloading into the same SELECT that fetches the entities.\n */\nexport function loadBatchLoader(\n  em: EntityManager,\n  meta: EntityMetadata,\n  overwriteExisting: boolean = false,\n): BatchLoader<{ taggedId: string; hint: LoadHint<any> | undefined }> {\n  return em.getBatchLoader(loadOperation, `${meta.type}-${overwriteExisting}`, async (loads) => {\n    const keys = loads.map((l) => keyToNumber(meta, l.taggedId));\n    const alias = abbreviation(meta.tableName);\n    const query = {\n      selects: meta.hasLazyColumns ? lazyExcludedSelects(meta, alias) : [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: {\n        kind: \"exp\",\n        op: \"and\",\n        conditions: [{ kind: \"column\", alias, column: \"id\", dbType: meta.idDbType, cond: { kind: \"in\", value: keys } }],\n      },\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n    } satisfies ParsedFindQuery;\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n    // Inject preloading joins into the query if enabled\n    const { preloader } = getEmInternalApi(em);\n    const preloadHydrator =\n      preloader &&\n      preloader.addPreloading(meta, buildHintTree(loads.map((l) => ({ entity: l.taggedId, hint: l.hint }))), query);\n    const rowData = await em[\"executeFindRowData\"](meta, loadOperation, query, {});\n    em[\"hydrateAndFinalize\"](meta.cstr, rowData, {\n      overwriteExisting,\n      sidecars: (entities) => {\n        preloadHydrator && preloadHydrator(rowData, entities);\n        // If we're missing any requested rows, mark any requested-but-not-found entities as deleted\n        if (rowData.rowCount !== loads.length) {\n          const foundIds = new Set<string>();\n          for (let i = 0; i < rowData.rowCount; i++) foundIds.add(tagId(meta, rowData.get(i, \"id\")));\n          for (const load of loads) {\n            if (!foundIds.has(load.taggedId)) {\n              const existingEntity = em.findExistingInstance(load.taggedId);\n              if (existingEntity) {\n                getInstanceData(existingEntity).markDeletedBecauseNotFound();\n              }\n            }\n          }\n        }\n      },\n    });\n  });\n}\n"],"mappings":";;;;;;;;;;;;AAWA,MAAa,gBAAgB;;;;;;;;AAS7B,SAAgB,gBACd,IACA,MACA,oBAA6B,OACuC;CACpE,OAAO,GAAG,eAAe,eAAe,GAAG,KAAK,KAAK,GAAG,qBAAqB,OAAO,UAAU;EAC5F,MAAM,OAAO,MAAM,KAAK,MAAMA,aAAAA,YAAY,MAAM,EAAE,QAAQ,CAAC;EAC3D,MAAM,QAAQC,cAAAA,aAAa,KAAK,SAAS;EACzC,MAAM,QAAQ;GACZ,SAAS,KAAK,iBAAiBC,iCAAAA,oBAAoB,MAAM,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI;GACjF,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,CAAC;KAAE,MAAM;KAAU;KAAO,QAAQ;KAAM,QAAQ,KAAK;KAAU,MAAM;MAAE,MAAM;MAAM,OAAO;KAAK;IAAE,CAAC;GAChH;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;EAClD;EACA,iCAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,EAAE,cAAcC,sBAAAA,iBAAiB,EAAE;EACzC,MAAM,kBACJ,aACA,UAAU,cAAc,MAAMC,iBAAAA,cAAc,MAAM,KAAK,OAAO;GAAE,QAAQ,EAAE;GAAU,MAAM,EAAE;EAAK,EAAE,CAAC,GAAG,KAAK;EAC9G,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,eAAe,OAAO,CAAC,CAAC;EAC7E,GAAG,qBAAqB,CAAC,KAAK,MAAM,SAAS;GAC3C;GACA,WAAW,aAAa;IACtB,mBAAmB,gBAAgB,SAAS,QAAQ;IAEpD,IAAI,QAAQ,aAAa,MAAM,QAAQ;KACrC,MAAM,2BAAW,IAAI,IAAY;KACjC,KAAK,IAAI,IAAI,GAAG,IAAI,QAAQ,UAAU,KAAK,SAAS,IAAIC,aAAAA,MAAM,MAAM,QAAQ,IAAI,GAAG,IAAI,CAAC,CAAC;KACzF,KAAK,MAAM,QAAQ,OACjB,IAAI,CAAC,SAAS,IAAI,KAAK,QAAQ,GAAG;MAChC,MAAM,iBAAiB,GAAG,qBAAqB,KAAK,QAAQ;MAC5D,IAAI,gBACF,mBAAA,gBAAgB,cAAc,CAAC,CAAC,2BAA2B;KAE/D;IAEJ;GACF;EACF,CAAC;CACH,CAAC;AACH"}

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

@@ -1 +1 @@
-{"version":3,"file":"loadBatchLoader.d.cts","names":[],"sources":["../../src/batchloaders/loadBatchLoader.ts"],"mappings":";;;;;cAUa;;;;;;;;iBASG,gBACd,IAAI,eACJ,MAAM,gBACN,8BACC;EAAc;EAAkB,MAAM"}
+{"version":3,"file":"loadBatchLoader.d.cts","names":[],"sources":["../../src/batchloaders/loadBatchLoader.ts"],"mappings":";;;;;cAWa;;;;;;;;iBASG,gBACd,IAAI,eACJ,MAAM,gBACN,8BACC;EAAc;EAAkB,MAAM"}

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

@@ -1 +1 @@
-{"version":3,"file":"loadBatchLoader.d.mts","names":[],"sources":["../../src/batchloaders/loadBatchLoader.ts"],"mappings":";;;;;cAUa;;;;;;;;iBASG,gBACd,IAAI,eACJ,MAAM,gBACN,8BACC;EAAc;EAAkB,MAAM"}
+{"version":3,"file":"loadBatchLoader.d.mts","names":[],"sources":["../../src/batchloaders/loadBatchLoader.ts"],"mappings":";;;;;cAWa;;;;;;;;iBASG,gBACd,IAAI,eACJ,MAAM,gBACN,8BACC;EAAc;EAAkB,MAAM"}

package/build/batchloaders/loadBatchLoader.js

@@ -1,12 +1,13 @@
 import "./BatchLoader.js";
-import { keyToNumber, tagId } from "../keys.js";
-import "../EntityMetadata.js";
+import { lazyExcludedSelects } from "../queries/entityQueryUtils.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
 import "../loadHints.js";
 import { abbreviation } from "../utils.js";
+import { keyToNumber, tagId } from "../keys.js";
+import "../EntityMetadata.js";
 import { buildHintTree } from "../HintTree.js";
 import { getEmInternalApi } from "../EntityManager.js";
 import { getInstanceData } from "../BaseEntity.js";
-import { addTablePerClassJoinsAndClassTag, lazyExcludedSelects } from "../QueryParser.js";
 //#region src/batchloaders/loadBatchLoader.ts
 const loadOperation = "load";
 /**

package/build/batchloaders/loadBatchLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadBatchLoader.js","names":[],"sources":["../../src/batchloaders/loadBatchLoader.ts"],"sourcesContent":["import { getInstanceData } from \"../BaseEntity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"../EntityManager.ts\";\nimport { type EntityMetadata } from \"../EntityMetadata.ts\";\nimport { buildHintTree } from \"../HintTree.ts\";\nimport { keyToNumber, tagId } from \"../keys.ts\";\nimport { type LoadHint } from \"../loadHints.ts\";\nimport { type ParsedFindQuery, addTablePerClassJoinsAndClassTag, lazyExcludedSelects } from \"../QueryParser.ts\";\nimport { abbreviation } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\n\nexport const loadOperation = \"load\";\n\n/**\n * Batches em.load-style fetches, writing to identity map (via hydrate) instead of returning values.\n * After the batch resolves, callers retrieve their entity from `em.findExistingInstance`.\n *\n * Accepts tuples of `{ taggedId, hint }` so the preloader can inject join-based\n * preloading into the same SELECT that fetches the entities.\n */\nexport function loadBatchLoader(\n  em: EntityManager,\n  meta: EntityMetadata,\n  overwriteExisting: boolean = false,\n): BatchLoader<{ taggedId: string; hint: LoadHint<any> | undefined }> {\n  return em.getBatchLoader(loadOperation, `${meta.type}-${overwriteExisting}`, async (loads) => {\n    const keys = loads.map((l) => keyToNumber(meta, l.taggedId));\n    const alias = abbreviation(meta.tableName);\n    const query = {\n      selects: meta.hasLazyColumns ? lazyExcludedSelects(meta, alias) : [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: {\n        kind: \"exp\",\n        op: \"and\",\n        conditions: [{ kind: \"column\", alias, column: \"id\", dbType: meta.idDbType, cond: { kind: \"in\", value: keys } }],\n      },\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n    } satisfies ParsedFindQuery;\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n    // Inject preloading joins into the query if enabled\n    const { preloader } = getEmInternalApi(em);\n    const preloadHydrator =\n      preloader &&\n      preloader.addPreloading(meta, buildHintTree(loads.map((l) => ({ entity: l.taggedId, hint: l.hint }))), query);\n    const rowData = await em[\"executeFindRowData\"](meta, loadOperation, query, {});\n    em[\"hydrateAndFinalize\"](meta.cstr, rowData, {\n      overwriteExisting,\n      sidecars: (entities) => {\n        preloadHydrator && preloadHydrator(rowData, entities);\n        // If we're missing any requested rows, mark any requested-but-not-found entities as deleted\n        if (rowData.rowCount !== loads.length) {\n          const foundIds = new Set<string>();\n          for (let i = 0; i < rowData.rowCount; i++) foundIds.add(tagId(meta, rowData.get(i, \"id\")));\n          for (const load of loads) {\n            if (!foundIds.has(load.taggedId)) {\n              const existingEntity = em.findExistingInstance(load.taggedId);\n              if (existingEntity) {\n                getInstanceData(existingEntity).markDeletedBecauseNotFound();\n              }\n            }\n          }\n        }\n      },\n    });\n  });\n}\n"],"mappings":";;;;;;;;;;AAUA,MAAa,gBAAgB;;;;;;;;AAS7B,SAAgB,gBACd,IACA,MACA,oBAA6B,OACuC;CACpE,OAAO,GAAG,eAAe,eAAe,GAAG,KAAK,KAAK,GAAG,qBAAqB,OAAO,UAAU;EAC5F,MAAM,OAAO,MAAM,KAAK,MAAM,YAAY,MAAM,EAAE,QAAQ,CAAC;EAC3D,MAAM,QAAQ,aAAa,KAAK,SAAS;EACzC,MAAM,QAAQ;GACZ,SAAS,KAAK,iBAAiB,oBAAoB,MAAM,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI;GACjF,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,CAAC;KAAE,MAAM;KAAU;KAAO,QAAQ;KAAM,QAAQ,KAAK;KAAU,MAAM;MAAE,MAAM;MAAM,OAAO;KAAK;IAAE,CAAC;GAChH;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;EAClD;EACA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,EAAE,cAAc,iBAAiB,EAAE;EACzC,MAAM,kBACJ,aACA,UAAU,cAAc,MAAM,cAAc,MAAM,KAAK,OAAO;GAAE,QAAQ,EAAE;GAAU,MAAM,EAAE;EAAK,EAAE,CAAC,GAAG,KAAK;EAC9G,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,eAAe,OAAO,CAAC,CAAC;EAC7E,GAAG,qBAAqB,CAAC,KAAK,MAAM,SAAS;GAC3C;GACA,WAAW,aAAa;IACtB,mBAAmB,gBAAgB,SAAS,QAAQ;IAEpD,IAAI,QAAQ,aAAa,MAAM,QAAQ;KACrC,MAAM,2BAAW,IAAI,IAAY;KACjC,KAAK,IAAI,IAAI,GAAG,IAAI,QAAQ,UAAU,KAAK,SAAS,IAAI,MAAM,MAAM,QAAQ,IAAI,GAAG,IAAI,CAAC,CAAC;KACzF,KAAK,MAAM,QAAQ,OACjB,IAAI,CAAC,SAAS,IAAI,KAAK,QAAQ,GAAG;MAChC,MAAM,iBAAiB,GAAG,qBAAqB,KAAK,QAAQ;MAC5D,IAAI,gBACF,gBAAgB,cAAc,CAAC,CAAC,2BAA2B;KAE/D;IAEJ;GACF;EACF,CAAC;CACH,CAAC;AACH"}
+{"version":3,"file":"loadBatchLoader.js","names":[],"sources":["../../src/batchloaders/loadBatchLoader.ts"],"sourcesContent":["import { getInstanceData } from \"../BaseEntity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"../EntityManager.ts\";\nimport { type EntityMetadata } from \"../EntityMetadata.ts\";\nimport { buildHintTree } from \"../HintTree.ts\";\nimport { keyToNumber, tagId } from \"../keys.ts\";\nimport { type LoadHint } from \"../loadHints.ts\";\nimport { lazyExcludedSelects } from \"../queries/entityQueryUtils.ts\";\nimport { type ParsedFindQuery, addTablePerClassJoinsAndClassTag } from \"../queries/find/QueryParser.ts\";\nimport { abbreviation } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\n\nexport const loadOperation = \"load\";\n\n/**\n * Batches em.load-style fetches, writing to identity map (via hydrate) instead of returning values.\n * After the batch resolves, callers retrieve their entity from `em.findExistingInstance`.\n *\n * Accepts tuples of `{ taggedId, hint }` so the preloader can inject join-based\n * preloading into the same SELECT that fetches the entities.\n */\nexport function loadBatchLoader(\n  em: EntityManager,\n  meta: EntityMetadata,\n  overwriteExisting: boolean = false,\n): BatchLoader<{ taggedId: string; hint: LoadHint<any> | undefined }> {\n  return em.getBatchLoader(loadOperation, `${meta.type}-${overwriteExisting}`, async (loads) => {\n    const keys = loads.map((l) => keyToNumber(meta, l.taggedId));\n    const alias = abbreviation(meta.tableName);\n    const query = {\n      selects: meta.hasLazyColumns ? lazyExcludedSelects(meta, alias) : [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: {\n        kind: \"exp\",\n        op: \"and\",\n        conditions: [{ kind: \"column\", alias, column: \"id\", dbType: meta.idDbType, cond: { kind: \"in\", value: keys } }],\n      },\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n    } satisfies ParsedFindQuery;\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n    // Inject preloading joins into the query if enabled\n    const { preloader } = getEmInternalApi(em);\n    const preloadHydrator =\n      preloader &&\n      preloader.addPreloading(meta, buildHintTree(loads.map((l) => ({ entity: l.taggedId, hint: l.hint }))), query);\n    const rowData = await em[\"executeFindRowData\"](meta, loadOperation, query, {});\n    em[\"hydrateAndFinalize\"](meta.cstr, rowData, {\n      overwriteExisting,\n      sidecars: (entities) => {\n        preloadHydrator && preloadHydrator(rowData, entities);\n        // If we're missing any requested rows, mark any requested-but-not-found entities as deleted\n        if (rowData.rowCount !== loads.length) {\n          const foundIds = new Set<string>();\n          for (let i = 0; i < rowData.rowCount; i++) foundIds.add(tagId(meta, rowData.get(i, \"id\")));\n          for (const load of loads) {\n            if (!foundIds.has(load.taggedId)) {\n              const existingEntity = em.findExistingInstance(load.taggedId);\n              if (existingEntity) {\n                getInstanceData(existingEntity).markDeletedBecauseNotFound();\n              }\n            }\n          }\n        }\n      },\n    });\n  });\n}\n"],"mappings":";;;;;;;;;;;AAWA,MAAa,gBAAgB;;;;;;;;AAS7B,SAAgB,gBACd,IACA,MACA,oBAA6B,OACuC;CACpE,OAAO,GAAG,eAAe,eAAe,GAAG,KAAK,KAAK,GAAG,qBAAqB,OAAO,UAAU;EAC5F,MAAM,OAAO,MAAM,KAAK,MAAM,YAAY,MAAM,EAAE,QAAQ,CAAC;EAC3D,MAAM,QAAQ,aAAa,KAAK,SAAS;EACzC,MAAM,QAAQ;GACZ,SAAS,KAAK,iBAAiB,oBAAoB,MAAM,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI;GACjF,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,CAAC;KAAE,MAAM;KAAU;KAAO,QAAQ;KAAM,QAAQ,KAAK;KAAU,MAAM;MAAE,MAAM;MAAM,OAAO;KAAK;IAAE,CAAC;GAChH;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;EAClD;EACA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,EAAE,cAAc,iBAAiB,EAAE;EACzC,MAAM,kBACJ,aACA,UAAU,cAAc,MAAM,cAAc,MAAM,KAAK,OAAO;GAAE,QAAQ,EAAE;GAAU,MAAM,EAAE;EAAK,EAAE,CAAC,GAAG,KAAK;EAC9G,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,eAAe,OAAO,CAAC,CAAC;EAC7E,GAAG,qBAAqB,CAAC,KAAK,MAAM,SAAS;GAC3C;GACA,WAAW,aAAa;IACtB,mBAAmB,gBAAgB,SAAS,QAAQ;IAEpD,IAAI,QAAQ,aAAa,MAAM,QAAQ;KACrC,MAAM,2BAAW,IAAI,IAAY;KACjC,KAAK,IAAI,IAAI,GAAG,IAAI,QAAQ,UAAU,KAAK,SAAS,IAAI,MAAM,MAAM,QAAQ,IAAI,GAAG,IAAI,CAAC,CAAC;KACzF,KAAK,MAAM,QAAQ,OACjB,IAAI,CAAC,SAAS,IAAI,KAAK,QAAQ,GAAG;MAChC,MAAM,iBAAiB,GAAG,qBAAqB,KAAK,QAAQ;MAC5D,IAAI,gBACF,gBAAgB,cAAc,CAAC,CAAC,2BAA2B;KAE/D;IAEJ;GACF;EACF,CAAC;CACH,CAAC;AACH"}

package/build/batchloaders/manyToManyBatchLoader.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./BatchLoader.cjs");
-const require_keys = require("../keys.cjs");
 const require_utils = require("../utils.cjs");
+const require_keys = require("../keys.cjs");
 require("../index.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
 require("../Entity.cjs");

package/build/batchloaders/manyToManyBatchLoader.js

@@ -1,6 +1,6 @@
 import "./BatchLoader.js";
-import { keyToNumber } from "../keys.js";
 import { abbreviation, getOrSet } from "../utils.js";
+import { keyToNumber } from "../keys.js";
 import "../index.js";
 import { getEmInternalApi } from "../EntityManager.js";
 import "../Entity.js";

package/build/batchloaders/oneToManyBatchLoader.cjs

@@ -1,12 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./BatchLoader.cjs");
-const require_keys = require("../keys.cjs");
 const require_fields = require("../fields.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
 const require_utils = require("../utils.cjs");
+const require_keys = require("../keys.cjs");
 require("../index.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
 require("../Entity.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
 //#region src/batchloaders/oneToManyBatchLoader.ts
 const oneToManyLoadOperation = "o2m-load";
 function oneToManyBatchLoader(em, collection) {
@@ -46,7 +46,7 @@ function oneToManyBatchLoader(em, collection) {
 				order: "ASC"
 			}]
 		};
-		require_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
+		require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
 		const rowData = await em["executeFindRowData"](meta, oneToManyLoadOperation, query, {});
 		const entities = em["hydrateAndFinalize"](meta.cstr, rowData);
 		const entitiesById = require_utils.groupBy(entities, (entity) => {

package/build/batchloaders/oneToManyBatchLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"oneToManyBatchLoader.cjs","names":["deTagIds","abbreviation","groupBy","maybeResolveReferenceToId","getField","getEmInternalApi"],"sources":["../../src/batchloaders/oneToManyBatchLoader.ts"],"sourcesContent":["import { type Entity } from \"../Entity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"../EntityManager.ts\";\nimport { getField } from \"../fields.ts\";\nimport {\n  type OneToManyCollection,\n  type OneToManyField,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  assertIdsAreTagged,\n  deTagIds,\n  maybeResolveReferenceToId,\n} from \"../index.ts\";\nimport { abbreviation, groupBy } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\n\nexport const oneToManyLoadOperation = \"o2m-load\";\n\nexport function oneToManyBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: OneToManyCollection<T, U>,\n): BatchLoader<string> {\n  const { meta: oneMeta, fieldName } = collection;\n  const batchKey = `${oneMeta.tableName}-${fieldName}`;\n  return em.getBatchLoader(oneToManyLoadOperation, batchKey, async (_keys) => {\n    const { otherMeta: meta } = collection;\n\n    assertIdsAreTagged(_keys);\n    const keys = deTagIds(oneMeta, _keys);\n\n    const alias = abbreviation(meta.tableName);\n    const o2m = oneMeta.allFields[collection.fieldName] as OneToManyField;\n    const other = meta.allFields[collection.otherFieldName];\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: {\n        kind: \"exp\",\n        op: \"and\",\n        conditions: [\n          {\n            kind: \"column\",\n            alias: `${alias}${other.aliasSuffix}`,\n            column: o2m.otherColumnName,\n            dbType: meta.idDbType,\n            cond: { kind: \"in\", value: keys },\n          },\n        ],\n      },\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n\n    const rowData = await em[\"executeFindRowData\"](meta, oneToManyLoadOperation, query, {});\n    const entities = em[\"hydrateAndFinalize\"](meta.cstr, rowData);\n\n    const entitiesById = groupBy(entities, (entity) => {\n      const ownerId = maybeResolveReferenceToId(getField(entity, collection.otherFieldName));\n      return ownerId ?? \"dummyNoLongerOwned\";\n    });\n\n    const api = getEmInternalApi(em);\n    for (const key of _keys) {\n      api.setPreloadedRelation(key, fieldName, entitiesById.get(key) || []);\n    }\n  });\n}\n"],"mappings":";;;;;;;;;;AAeA,MAAa,yBAAyB;AAEtC,SAAgB,qBACd,IACA,YACqB;CACrB,MAAM,EAAE,MAAM,SAAS,cAAc;CACrC,MAAM,WAAW,GAAG,QAAQ,UAAU,GAAG;CACzC,OAAO,GAAG,eAAe,wBAAwB,UAAU,OAAO,UAAU;EAC1E,MAAM,EAAE,WAAW,SAAS;EAE5B,aAAA,mBAAmB,KAAK;EACxB,MAAM,OAAOA,aAAAA,SAAS,SAAS,KAAK;EAEpC,MAAM,QAAQC,cAAAA,aAAa,KAAK,SAAS;EACzC,MAAM,MAAM,QAAQ,UAAU,WAAW;EACzC,MAAM,QAAQ,KAAK,UAAU,WAAW;EACxC,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,CACV;KACE,MAAM;KACN,OAAO,GAAG,QAAQ,MAAM;KACxB,QAAQ,IAAI;KACZ,QAAQ,KAAK;KACb,MAAM;MAAE,MAAM;MAAM,OAAO;KAAK;IAClC,CACF;GACF;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;EAClD;EAEA,oBAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,wBAAwB,OAAO,CAAC,CAAC;EACtF,MAAM,WAAW,GAAG,qBAAqB,CAAC,KAAK,MAAM,OAAO;EAE5D,MAAM,eAAeC,cAAAA,QAAQ,WAAW,WAAW;GAEjD,OADgBC,aAAAA,0BAA0BC,eAAAA,SAAS,QAAQ,WAAW,cAAc,CACvE,KAAK;EACpB,CAAC;EAED,MAAM,MAAMC,sBAAAA,iBAAiB,EAAE;EAC/B,KAAK,MAAM,OAAO,OAChB,IAAI,qBAAqB,KAAK,WAAW,aAAa,IAAI,GAAG,KAAK,CAAC,CAAC;CAExE,CAAC;AACH"}
+{"version":3,"file":"oneToManyBatchLoader.cjs","names":["deTagIds","abbreviation","groupBy","maybeResolveReferenceToId","getField","getEmInternalApi"],"sources":["../../src/batchloaders/oneToManyBatchLoader.ts"],"sourcesContent":["import { type Entity } from \"../Entity.ts\";\nimport { type EntityManager, getEmInternalApi } from \"../EntityManager.ts\";\nimport { getField } from \"../fields.ts\";\nimport {\n  type OneToManyCollection,\n  type OneToManyField,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  assertIdsAreTagged,\n  deTagIds,\n  maybeResolveReferenceToId,\n} from \"../index.ts\";\nimport { abbreviation, groupBy } from \"../utils.ts\";\nimport { type BatchLoader } from \"./BatchLoader.ts\";\n\nexport const oneToManyLoadOperation = \"o2m-load\";\n\nexport function oneToManyBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: OneToManyCollection<T, U>,\n): BatchLoader<string> {\n  const { meta: oneMeta, fieldName } = collection;\n  const batchKey = `${oneMeta.tableName}-${fieldName}`;\n  return em.getBatchLoader(oneToManyLoadOperation, batchKey, async (_keys) => {\n    const { otherMeta: meta } = collection;\n\n    assertIdsAreTagged(_keys);\n    const keys = deTagIds(oneMeta, _keys);\n\n    const alias = abbreviation(meta.tableName);\n    const o2m = oneMeta.allFields[collection.fieldName] as OneToManyField;\n    const other = meta.allFields[collection.otherFieldName];\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: {\n        kind: \"exp\",\n        op: \"and\",\n        conditions: [\n          {\n            kind: \"column\",\n            alias: `${alias}${other.aliasSuffix}`,\n            column: o2m.otherColumnName,\n            dbType: meta.idDbType,\n            cond: { kind: \"in\", value: keys },\n          },\n        ],\n      },\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n\n    const rowData = await em[\"executeFindRowData\"](meta, oneToManyLoadOperation, query, {});\n    const entities = em[\"hydrateAndFinalize\"](meta.cstr, rowData);\n\n    const entitiesById = groupBy(entities, (entity) => {\n      const ownerId = maybeResolveReferenceToId(getField(entity, collection.otherFieldName));\n      return ownerId ?? \"dummyNoLongerOwned\";\n    });\n\n    const api = getEmInternalApi(em);\n    for (const key of _keys) {\n      api.setPreloadedRelation(key, fieldName, entitiesById.get(key) || []);\n    }\n  });\n}\n"],"mappings":";;;;;;;;;;AAeA,MAAa,yBAAyB;AAEtC,SAAgB,qBACd,IACA,YACqB;CACrB,MAAM,EAAE,MAAM,SAAS,cAAc;CACrC,MAAM,WAAW,GAAG,QAAQ,UAAU,GAAG;CACzC,OAAO,GAAG,eAAe,wBAAwB,UAAU,OAAO,UAAU;EAC1E,MAAM,EAAE,WAAW,SAAS;EAE5B,aAAA,mBAAmB,KAAK;EACxB,MAAM,OAAOA,aAAAA,SAAS,SAAS,KAAK;EAEpC,MAAM,QAAQC,cAAAA,aAAa,KAAK,SAAS;EACzC,MAAM,MAAM,QAAQ,UAAU,WAAW;EACzC,MAAM,QAAQ,KAAK,UAAU,WAAW;EACxC,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IACT,MAAM;IACN,IAAI;IACJ,YAAY,CACV;KACE,MAAM;KACN,OAAO,GAAG,QAAQ,MAAM;KACxB,QAAQ,IAAI;KACZ,QAAQ,KAAK;KACb,MAAM;MAAE,MAAM;MAAM,OAAO;KAAK;IAClC,CACF;GACF;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;EAClD;EAEA,iCAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,wBAAwB,OAAO,CAAC,CAAC;EACtF,MAAM,WAAW,GAAG,qBAAqB,CAAC,KAAK,MAAM,OAAO;EAE5D,MAAM,eAAeC,cAAAA,QAAQ,WAAW,WAAW;GAEjD,OADgBC,aAAAA,0BAA0BC,eAAAA,SAAS,QAAQ,WAAW,cAAc,CACvE,KAAK;EACpB,CAAC;EAED,MAAM,MAAMC,sBAAAA,iBAAiB,EAAE;EAC/B,KAAK,MAAM,OAAO,OAChB,IAAI,qBAAqB,KAAK,WAAW,aAAa,IAAI,GAAG,KAAK,CAAC,CAAC;CAExE,CAAC;AACH"}

package/build/batchloaders/oneToManyBatchLoader.js

@@ -1,11 +1,11 @@
 import "./BatchLoader.js";
-import { assertIdsAreTagged, deTagIds, maybeResolveReferenceToId } from "../keys.js";
 import { getField } from "../fields.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
 import { abbreviation, groupBy } from "../utils.js";
+import { assertIdsAreTagged, deTagIds, maybeResolveReferenceToId } from "../keys.js";
 import "../index.js";
 import { getEmInternalApi } from "../EntityManager.js";
 import "../Entity.js";
-import { addTablePerClassJoinsAndClassTag } from "../QueryParser.js";
 //#region src/batchloaders/oneToManyBatchLoader.ts
 const oneToManyLoadOperation = "o2m-load";
 function oneToManyBatchLoader(em, collection) {

package/build/batchloaders/oneToOneBatchLoader.cjs

@@ -1,14 +1,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./BatchLoader.cjs");
+const require_fields = require("../fields.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
 require("../relations/OneToOneReference.cjs");
+const require_utils = require("../utils.cjs");
 const require_keys = require("../keys.cjs");
 const require_EntityMetadata = require("../EntityMetadata.cjs");
-const require_fields = require("../fields.cjs");
-const require_utils = require("../utils.cjs");
 require("../index.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
 require("../Entity.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
 //#region src/batchloaders/oneToOneBatchLoader.ts
 const oneToOneLoadOperation = "o2o-load";
 function oneToOneBatchLoader(em, reference) {
@@ -44,7 +44,7 @@ function oneToOneBatchLoader(em, reference) {
 			},
 			orderBys: []
 		};
-		require_QueryParser.addTablePerClassJoinsAndClassTag(query, otherMeta, alias, true);
+		require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, otherMeta, alias, true);
 		const rowData = await em["executeFindRowData"](otherMeta, oneToOneLoadOperation, query, {});
 		const entities = em["hydrateAndFinalize"](otherMeta.cstr, rowData);
 		const entitiesByOtherId = require_utils.groupBy(entities, (entity) => {

package/build/batchloaders/oneToOneBatchLoader.cjs.map

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

package/build/batchloaders/oneToOneBatchLoader.js

@@ -1,13 +1,13 @@
 import "./BatchLoader.js";
+import { getField } from "../fields.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
 import "../relations/OneToOneReference.js";
+import { abbreviation, groupBy } from "../utils.js";
 import { assertIdsAreTagged, deTagIds, maybeResolveReferenceToId } from "../keys.js";
 import { getMetadata } from "../EntityMetadata.js";
-import { getField } from "../fields.js";
-import { abbreviation, groupBy } from "../utils.js";
 import "../index.js";
 import { getEmInternalApi } from "../EntityManager.js";
 import "../Entity.js";
-import { addTablePerClassJoinsAndClassTag } from "../QueryParser.js";
 //#region src/batchloaders/oneToOneBatchLoader.ts
 const oneToOneLoadOperation = "o2o-load";
 function oneToOneBatchLoader(em, reference) {