metal-orm 1.0.42 → 1.0.44

package/src/query-builder/select-helpers.ts

@@ -4,6 +4,12 @@ import { getTableDefFromEntity } from '../decorators/bootstrap.js';
 
 /**
  * Build a typed selection map from a TableDef.
+ * @template TTable - The table definition type
+ * @template K - The column name keys
+ * @param table - The table definition to select columns from
+ * @param cols - Column names to include in the selection
+ * @returns A typed record mapping column names to their definitions
+ * @throws Error if a specified column is not found on the table
  */
 export function sel<
   TTable extends TableDef,
@@ -22,12 +28,19 @@ export function sel<
   return selection;
 }
 
-type Ctor<T> = { new (...args: any[]): T };
+type Ctor<T> = { new(...args: unknown[]): T };
 
 /**
  * Build a typed selection map from an entity constructor.
+ * @template TEntity - The entity type
+ * @template K - The property name keys
+ * @param entity - The entity constructor to get table definition from
+ * @param props - Property names to include in the selection
+ * @returns A record mapping property names to their column definitions
+ * @throws Error if no table definition is registered for the entity
+ * @throws Error if a specified property is not found as a column
  */
-export function esel<TEntity, K extends keyof TEntity & string>(
+export function esel<TEntity extends object, K extends keyof TEntity & string>(
   entity: Ctor<TEntity>,
   ...props: K[]
 ): Record<K, ColumnDef> {

package/src/query-builder/select-query-builder-deps.ts

@@ -4,6 +4,8 @@ import { HydrationManager } from './hydration-manager.js';
 import { HydrationPlanner } from './hydration-planner.js';
 import { QueryAstService } from './query-ast-service.js';
 import { RelationService } from './relation-service.js';
+import { ColumnSelector } from './column-selector.js';
+import { RelationManager } from './relation-manager.js';
 
 /**
  * Context for query building operations
@@ -60,6 +62,18 @@ export interface SelectQueryBuilderDependencies {
     state: SelectQueryState,
     hydration: HydrationManager
   ) => RelationService;
+  /**
+   * Creates a new column selector
+   * @param env - Query builder environment
+   * @returns New column selector
+   */
+  createColumnSelector: (env: SelectQueryBuilderEnvironment) => ColumnSelector;
+  /**
+   * Creates a new relation manager
+   * @param env - Query builder environment
+   * @returns New relation manager
+   */
+  createRelationManager: (env: SelectQueryBuilderEnvironment) => RelationManager;
 }
 
 /**
@@ -99,13 +113,17 @@ export const resolveSelectQueryBuilderDependencies = (
   const createRelationService =
     overrides.createRelationService ??
     ((table, state, hydration) => new RelationService(table, state, hydration, createQueryAstService));
+  const createColumnSelector = overrides.createColumnSelector ?? (env => new ColumnSelector(env));
+  const createRelationManager = overrides.createRelationManager ?? (env => new RelationManager(env));
 
   return {
     createState: overrides.createState ?? (table => new SelectQueryState(table)),
     createHydration,
     createHydrationPlanner,
     createQueryAstService,
-    createRelationService
+    createRelationService,
+    createColumnSelector,
+    createRelationManager
   };
 };
 

package/src/query-builder/select-query-state.ts

@@ -7,6 +7,7 @@ import {
   TableSourceNode,
   OrderingTerm
 } from '../core/ast/query.js';
+import { createTableNode } from '../core/ast/builders.js';
 import {
   ColumnNode,
   ExpressionNode,
@@ -49,7 +50,7 @@ export class SelectQueryState {
     this.table = table;
     this.ast = ast ?? {
       type: 'SelectQuery',
-      from: { type: 'Table', name: table.name },
+      from: createTableNode(table),
       columns: [],
       joins: []
     };