metal-orm 1.1.10 → 1.1.16

package/src/query-builder/select/relation-facet.ts

@@ -1,81 +1,81 @@
-import { ExpressionNode } from '../../core/ast/expression.js';
-import { JoinKind } from '../../core/sql/sql.js';
-import { SelectQueryBuilderContext } from '../select-query-builder-deps.js';
-import { RelationManager } from '../relation-manager.js';
-import { RelationIncludeOptions } from '../relation-types.js';
-import { SelectQueryNode } from '../../core/ast/query.js';
-
-/**
- * Facet responsible for relation operations (include, match, whereHas, etc.)
- */
-export class SelectRelationFacet {
-    /**
-     * Creates a new SelectRelationFacet instance
-     * @param relationManager - Relation manager dependency
-     */
-    constructor(private readonly relationManager: RelationManager) { }
-
-    /**
-     * Matches records based on a relationship
-     * @param context - Current query context
-     * @param relationName - Name of the relationship
-     * @param predicate - Optional predicate
-     * @returns Updated query context with relation match
-     */
-    match(
-        context: SelectQueryBuilderContext,
-        relationName: string,
-        predicate?: ExpressionNode
-    ): SelectQueryBuilderContext {
-        return this.relationManager.match(context, relationName, predicate);
-    }
-
-    /**
-     * Joins a related table
-     * @param context - Current query context
-     * @param relationName - Name of the relationship
-     * @param joinKind - Type of join
-     * @param extraCondition - Optional additional condition
-     * @returns Updated query context with relation join
-     */
-    joinRelation(
-        context: SelectQueryBuilderContext,
-        relationName: string,
-        joinKind: JoinKind,
-        extraCondition?: ExpressionNode
-    ): SelectQueryBuilderContext {
-        return this.relationManager.joinRelation(context, relationName, joinKind, extraCondition);
-    }
-
-    /**
-     * Includes related data in the query results
-     * @param context - Current query context
-     * @param relationName - Name of the relationship to include
-     * @param options - Optional include options
-     * @returns Updated query context with relation inclusion
-     */
-    include(
-        context: SelectQueryBuilderContext,
-        relationName: string,
-        options?: RelationIncludeOptions
-    ): SelectQueryBuilderContext {
-        return this.relationManager.include(context, relationName, options);
-    }
-
-    /**
-     * Applies correlation for relation-based subqueries
-     * @param context - Current query context
-     * @param relationName - Name of the relationship
-     * @param subAst - Subquery AST
-     * @param extraCorrelate - Optional additional correlation
-     * @returns Modified subquery AST with correlation
-     */
-    applyRelationCorrelation(
-        context: SelectQueryBuilderContext,
-        relationName: string,
-        subAst: SelectQueryNode,
-        extraCorrelate?: ExpressionNode
-    ): SelectQueryNode {
-        return this.relationManager.applyRelationCorrelation(context, relationName, subAst, extraCorrelate);
-    }
-}
+import { ExpressionNode } from '../../core/ast/expression.js';
+import { JoinKind } from '../../core/sql/sql.js';
+import { SelectQueryBuilderContext } from '../select-query-builder-deps.js';
+import { RelationManager } from '../relation-manager.js';
+import { RelationIncludeOptions } from '../relation-types.js';
+import { SelectQueryNode } from '../../core/ast/query.js';
+
+/**
+ * Facet responsible for relation operations (include, match, whereHas, etc.)
+ */
+export class SelectRelationFacet {
+    /**
+     * Creates a new SelectRelationFacet instance
+     * @param relationManager - Relation manager dependency
+     */
+    constructor(private readonly relationManager: RelationManager) { }
+
+    /**
+     * Matches records based on a relationship
+     * @param context - Current query context
+     * @param relationName - Name of the relationship
+     * @param predicate - Optional predicate
+     * @returns Updated query context with relation match
+     */
+    match(
+        context: SelectQueryBuilderContext,
+        relationName: string,
+        predicate?: ExpressionNode
+    ): SelectQueryBuilderContext {
+        return this.relationManager.match(context, relationName, predicate);
+    }
+
+    /**
+     * Joins a related table
+     * @param context - Current query context
+     * @param relationName - Name of the relationship
+     * @param joinKind - Type of join
+     * @param extraCondition - Optional additional condition
+     * @returns Updated query context with relation join
+     */
+    joinRelation(
+        context: SelectQueryBuilderContext,
+        relationName: string,
+        joinKind: JoinKind,
+        extraCondition?: ExpressionNode
+    ): SelectQueryBuilderContext {
+        return this.relationManager.joinRelation(context, relationName, joinKind, extraCondition);
+    }
+
+    /**
+     * Includes related data in the query results
+     * @param context - Current query context
+     * @param relationName - Name of the relationship to include
+     * @param options - Optional include options
+     * @returns Updated query context with relation inclusion
+     */
+    include(
+        context: SelectQueryBuilderContext,
+        relationName: string,
+        options?: RelationIncludeOptions
+    ): SelectQueryBuilderContext {
+        return this.relationManager.include(context, relationName, options);
+    }
+
+    /**
+     * Applies correlation for relation-based subqueries
+     * @param context - Current query context
+     * @param relationName - Name of the relationship
+     * @param subAst - Subquery AST
+     * @param extraCorrelate - Optional additional correlation
+     * @returns Modified subquery AST with correlation
+     */
+    applyRelationCorrelation(
+        context: SelectQueryBuilderContext,
+        relationName: string,
+        subAst: SelectQueryNode,
+        extraCorrelate?: ExpressionNode
+    ): SelectQueryNode {
+        return this.relationManager.applyRelationCorrelation(context, relationName, subAst, extraCorrelate);
+    }
+}

package/src/query-builder/select/setop-facet.ts

@@ -1,36 +1,36 @@
-import { SelectQueryNode, SetOperationKind } from '../../core/ast/query.js';
-import { SelectQueryBuilderContext, SelectQueryBuilderEnvironment } from '../select-query-builder-deps.js';
-import { QueryAstService } from '../query-ast-service.js';
-import { SelectQueryState } from '../select-query-state.js';
-
-/**
- * Facet responsible for set operations (UNION, INTERSECT, EXCEPT)
- */
-export class SelectSetOpFacet {
-    /**
-     * Creates a new SelectSetOpFacet instance
-     * @param env - Query builder environment
-     * @param createAstService - Function to create AST service
-     */
-    constructor(
-        private readonly env: SelectQueryBuilderEnvironment,
-        private readonly createAstService: (state: SelectQueryState) => QueryAstService
-    ) { }
-
-    /**
-     * Applies a set operation to the query
-     * @param context - Current query context
-     * @param operator - Set operation kind
-     * @param subAst - Subquery AST to combine
-     * @returns Updated query context with set operation
-     */
-    applySetOperation(
-        context: SelectQueryBuilderContext,
-        operator: SetOperationKind,
-        subAst: SelectQueryNode
-    ): SelectQueryBuilderContext {
-        const astService = this.createAstService(context.state);
-        const nextState = astService.withSetOperation(operator, subAst);
-        return { state: nextState, hydration: context.hydration };
-    }
-}
+import { SelectQueryNode, SetOperationKind } from '../../core/ast/query.js';
+import { SelectQueryBuilderContext, SelectQueryBuilderEnvironment } from '../select-query-builder-deps.js';
+import { QueryAstService } from '../query-ast-service.js';
+import { SelectQueryState } from '../select-query-state.js';
+
+/**
+ * Facet responsible for set operations (UNION, INTERSECT, EXCEPT)
+ */
+export class SelectSetOpFacet {
+    /**
+     * Creates a new SelectSetOpFacet instance
+     * @param env - Query builder environment
+     * @param createAstService - Function to create AST service
+     */
+    constructor(
+        private readonly env: SelectQueryBuilderEnvironment,
+        private readonly createAstService: (state: SelectQueryState) => QueryAstService
+    ) { }
+
+    /**
+     * Applies a set operation to the query
+     * @param context - Current query context
+     * @param operator - Set operation kind
+     * @param subAst - Subquery AST to combine
+     * @returns Updated query context with set operation
+     */
+    applySetOperation(
+        context: SelectQueryBuilderContext,
+        operator: SetOperationKind,
+        subAst: SelectQueryNode
+    ): SelectQueryBuilderContext {
+        const astService = this.createAstService(context.state);
+        const nextState = astService.withSetOperation(operator, subAst);
+        return { state: nextState, hydration: context.hydration };
+    }
+}

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

@@ -61,4 +61,4 @@ export function esel<TEntity extends object, K extends keyof TEntity & string>(
 
   return selection;
 }
-
+

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

@@ -1,130 +1,130 @@
-import { TableDef } from '../schema/table.js';
-import { SelectQueryState } from './select-query-state.js';
-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
- */
-export interface SelectQueryBuilderContext {
-  /**
-   * Current query state
-   */
-  readonly state: SelectQueryState;
-  /**
-   * Hydration manager for the query
-   */
-  readonly hydration: HydrationManager;
-}
-
-/**
- * Dependencies for query builder operations
- */
-export interface SelectQueryBuilderDependencies {
-  /**
-   * Creates a new query state
-   * @param table - Table definition
-   * @returns New query state
-   */
-  createState: (table: TableDef) => SelectQueryState;
-  /**
-   * Creates a new hydration manager
-   * @param table - Table definition
-   * @returns New hydration manager
-   */
-  createHydration: (table: TableDef) => HydrationManager;
-  /**
-   * Creates a new hydration planner
-   * @param table - Table definition
-   * @returns Hydration planner
-   */
-  createHydrationPlanner: (table: TableDef) => HydrationPlanner;
-  /**
-   * Creates a new query AST service
-   * @param table - Table definition
-   * @param state - Query state
-   * @returns New query AST service
-   */
-  createQueryAstService: (table: TableDef, state: SelectQueryState) => QueryAstService;
-  /**
-   * Creates a new relation service
-   * @param table - Table definition
-   * @param state - Query state
-   * @param hydration - Hydration manager
-   * @returns New relation service
-   */
-  createRelationService: (
-    table: TableDef,
-    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;
-}
-
-/**
- * Environment for query builder operations
- */
-export interface SelectQueryBuilderEnvironment {
-  /**
-   * Table definition
-   */
-  readonly table: TableDef;
-  /**
-   * Query builder dependencies
-   */
-  readonly deps: SelectQueryBuilderDependencies;
-}
-
-/**
- * Default implementations for query builder dependencies
- */
-const defaultCreateQueryAstService = (table: TableDef, state: SelectQueryState) => new QueryAstService(table, state);
-const defaultCreateHydrationPlanner = (table: TableDef) => new HydrationPlanner(table);
-
-const defaultCreateHydration = (table: TableDef, plannerFactory: (table: TableDef) => HydrationPlanner) =>
-  new HydrationManager(table, plannerFactory(table));
-
-/**
- * Resolves query builder dependencies by merging overrides with internal defaults
- * @param overrides - Partial overrides for dependency factories
- */
-export const resolveSelectQueryBuilderDependencies = (
-  overrides: Partial<SelectQueryBuilderDependencies> = {}
-): SelectQueryBuilderDependencies => {
-  const createQueryAstService = overrides.createQueryAstService ?? defaultCreateQueryAstService;
-  const createHydrationPlanner = overrides.createHydrationPlanner ?? defaultCreateHydrationPlanner;
-  const createHydration =
-    overrides.createHydration ?? (table => defaultCreateHydration(table, createHydrationPlanner));
-  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,
-    createColumnSelector,
-    createRelationManager
-  };
-};
-
-export const defaultSelectQueryBuilderDependencies = resolveSelectQueryBuilderDependencies();
+import { TableDef } from '../schema/table.js';
+import { SelectQueryState } from './select-query-state.js';
+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
+ */
+export interface SelectQueryBuilderContext {
+  /**
+   * Current query state
+   */
+  readonly state: SelectQueryState;
+  /**
+   * Hydration manager for the query
+   */
+  readonly hydration: HydrationManager;
+}
+
+/**
+ * Dependencies for query builder operations
+ */
+export interface SelectQueryBuilderDependencies {
+  /**
+   * Creates a new query state
+   * @param table - Table definition
+   * @returns New query state
+   */
+  createState: (table: TableDef) => SelectQueryState;
+  /**
+   * Creates a new hydration manager
+   * @param table - Table definition
+   * @returns New hydration manager
+   */
+  createHydration: (table: TableDef) => HydrationManager;
+  /**
+   * Creates a new hydration planner
+   * @param table - Table definition
+   * @returns Hydration planner
+   */
+  createHydrationPlanner: (table: TableDef) => HydrationPlanner;
+  /**
+   * Creates a new query AST service
+   * @param table - Table definition
+   * @param state - Query state
+   * @returns New query AST service
+   */
+  createQueryAstService: (table: TableDef, state: SelectQueryState) => QueryAstService;
+  /**
+   * Creates a new relation service
+   * @param table - Table definition
+   * @param state - Query state
+   * @param hydration - Hydration manager
+   * @returns New relation service
+   */
+  createRelationService: (
+    table: TableDef,
+    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;
+}
+
+/**
+ * Environment for query builder operations
+ */
+export interface SelectQueryBuilderEnvironment {
+  /**
+   * Table definition
+   */
+  readonly table: TableDef;
+  /**
+   * Query builder dependencies
+   */
+  readonly deps: SelectQueryBuilderDependencies;
+}
+
+/**
+ * Default implementations for query builder dependencies
+ */
+const defaultCreateQueryAstService = (table: TableDef, state: SelectQueryState) => new QueryAstService(table, state);
+const defaultCreateHydrationPlanner = (table: TableDef) => new HydrationPlanner(table);
+
+const defaultCreateHydration = (table: TableDef, plannerFactory: (table: TableDef) => HydrationPlanner) =>
+  new HydrationManager(table, plannerFactory(table));
+
+/**
+ * Resolves query builder dependencies by merging overrides with internal defaults
+ * @param overrides - Partial overrides for dependency factories
+ */
+export const resolveSelectQueryBuilderDependencies = (
+  overrides: Partial<SelectQueryBuilderDependencies> = {}
+): SelectQueryBuilderDependencies => {
+  const createQueryAstService = overrides.createQueryAstService ?? defaultCreateQueryAstService;
+  const createHydrationPlanner = overrides.createHydrationPlanner ?? defaultCreateHydrationPlanner;
+  const createHydration =
+    overrides.createHydration ?? (table => defaultCreateHydration(table, createHydrationPlanner));
+  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,
+    createColumnSelector,
+    createRelationManager
+  };
+};
+
+export const defaultSelectQueryBuilderDependencies = resolveSelectQueryBuilderDependencies();