@hypequery/clickhouse 1.3.0 → 1.3.2

package/README.md

@@ -184,9 +184,25 @@ const tripsWithDrivers = await db.table('trips')
   .join('drivers', 'trips.driver_id', 'drivers.id')
   .execute();
 
+// After joining, TypeScript understands the expanded scope
+const tripsWithUsers = await db.table('trips')
+  .innerJoin('users', 'trips.user_id', 'users.id')
+  .select(['users.email', 'trips.trip_id'])
+  .where('users.email', 'like', '%@example.com')
+  .execute();
+
+// Keep literal column inference with selectConst and reuse joined columns in ORDER BY / HAVING
+const sortedTrips = await db.table('trips')
+  .innerJoin('users', 'trips.user_id', 'users.id')
+  .selectConst('users.email', 'trips.trip_id')
+  .groupBy(['users.email', 'trips.trip_id'])
+  .having('COUNT(*) > 1')
+  .orderBy('users.email', 'DESC')
+  .execute();
 
 ```
 
+`selectConst()` preserves literal column names (including aliases like `users.email`), which means TypeScript keeps those identifiers available for downstream `orderBy`, `groupBy`, and `having` calls.
 
 **Benefits:**
 - ✅ Works in all environments (Node.js, browser, bundlers)

package/dist/core/features/aggregations.d.ts

@@ -1,14 +1,10 @@
+import type { BuilderState, SchemaDefinition } from '../types/builder-state.js';
 import { QueryBuilder } from '../query-builder.js';
-import { ColumnType } from '../../types/schema.js';
-export declare class AggregationFeature<Schema extends {
-    [tableName: string]: {
-        [columnName: string]: ColumnType;
-    };
-}, T, HasSelect extends boolean = false, Aggregations = {}, OriginalT = T> {
+export declare class AggregationFeature<Schema extends SchemaDefinition<Schema>, State extends BuilderState<Schema, string, any, keyof Schema, Partial<Record<string, keyof Schema>>>> {
     private builder;
-    constructor(builder: QueryBuilder<Schema, T, HasSelect, Aggregations, OriginalT>);
+    constructor(builder: QueryBuilder<Schema, State>);
     private createAggregation;
-    sum<Column extends keyof OriginalT, Alias extends string = `${Column & string}_sum`>(column: Column, alias?: Alias): {
+    sum(column: string, alias: string): {
         select: string[];
         where?: import("../../types/base.js").WhereCondition[];
         groupBy?: string[];
@@ -17,7 +13,7 @@ export declare class AggregationFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | import("../../types/schema.js").TableColumn<Schema>;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
             direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
@@ -26,7 +22,7 @@ export declare class AggregationFeature<Schema extends {
         unionQueries?: string[];
         settings?: string;
     };
-    count<Column extends keyof OriginalT, Alias extends string = `${Column & string}_count`>(column: Column, alias?: Alias): {
+    count(column: string, alias: string): {
         select: string[];
         where?: import("../../types/base.js").WhereCondition[];
         groupBy?: string[];
@@ -35,7 +31,7 @@ export declare class AggregationFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | import("../../types/schema.js").TableColumn<Schema>;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
             direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
@@ -44,7 +40,7 @@ export declare class AggregationFeature<Schema extends {
         unionQueries?: string[];
         settings?: string;
     };
-    avg<Column extends keyof OriginalT, Alias extends string = `${Column & string}_avg`>(column: Column, alias?: Alias): {
+    avg(column: string, alias: string): {
         select: string[];
         where?: import("../../types/base.js").WhereCondition[];
         groupBy?: string[];
@@ -53,7 +49,7 @@ export declare class AggregationFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | import("../../types/schema.js").TableColumn<Schema>;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
             direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
@@ -62,7 +58,7 @@ export declare class AggregationFeature<Schema extends {
         unionQueries?: string[];
         settings?: string;
     };
-    min<Column extends keyof OriginalT, Alias extends string = `${Column & string}_min`>(column: Column, alias?: Alias): {
+    min(column: string, alias: string): {
         select: string[];
         where?: import("../../types/base.js").WhereCondition[];
         groupBy?: string[];
@@ -71,7 +67,7 @@ export declare class AggregationFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | import("../../types/schema.js").TableColumn<Schema>;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
             direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
@@ -80,7 +76,7 @@ export declare class AggregationFeature<Schema extends {
         unionQueries?: string[];
         settings?: string;
     };
-    max<Column extends keyof OriginalT, Alias extends string = `${Column & string}_max`>(column: Column, alias?: Alias): {
+    max(column: string, alias: string): {
         select: string[];
         where?: import("../../types/base.js").WhereCondition[];
         groupBy?: string[];
@@ -89,7 +85,7 @@ export declare class AggregationFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | import("../../types/schema.js").TableColumn<Schema>;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
             direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];

package/dist/core/features/aggregations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregations.d.ts","sourceRoot":"","sources":["../../../src/core/features/aggregations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,qBAAa,kBAAkB,CAC7B,MAAM,SAAS;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAA;CAAE,EAC5E,CAAC,EACD,SAAS,SAAS,OAAO,GAAG,KAAK,EACjC,YAAY,GAAG,EAAE,EACjB,SAAS,GAAG,CAAC;IAED,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC;IAExF,OAAO,CAAC,iBAAiB;IAsBzB,GAAG,CAAC,MAAM,SAAS,MAAM,SAAS,EAAE,KAAK,SAAS,MAAM,GAAG,GAAG,MAAM,GAAG,MAAM,MAAM,EACjF,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,KAAK;;;;;;;;;;;;;;;;;;IASf,KAAK,CAAC,MAAM,SAAS,MAAM,SAAS,EAAE,KAAK,SAAS,MAAM,GAAG,GAAG,MAAM,GAAG,MAAM,QAAQ,EACrF,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,KAAK;;;;;;;;;;;;;;;;;;IASf,GAAG,CAAC,MAAM,SAAS,MAAM,SAAS,EAAE,KAAK,SAAS,MAAM,GAAG,GAAG,MAAM,GAAG,MAAM,MAAM,EACjF,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,KAAK;;;;;;;;;;;;;;;;;;IASf,GAAG,CAAC,MAAM,SAAS,MAAM,SAAS,EAAE,KAAK,SAAS,MAAM,GAAG,GAAG,MAAM,GAAG,MAAM,MAAM,EACjF,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,KAAK;;;;;;;;;;;;;;;;;;IASf,GAAG,CAAC,MAAM,SAAS,MAAM,SAAS,EAAE,KAAK,SAAS,MAAM,GAAG,GAAG,MAAM,GAAG,MAAM,MAAM,EACjF,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,KAAK;;;;;;;;;;;;;;;;;;CAQhB"}
+{"version":3,"file":"aggregations.d.ts","sourceRoot":"","sources":["../../../src/core/features/aggregations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,qBAAa,kBAAkB,CAC7B,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,CAAC,CAAC;IAExF,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAExD,OAAO,CAAC,iBAAiB;IAsBzB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;IAIjC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;IAInC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;IAIjC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;IAIjC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;CAGlC"}

package/dist/core/features/aggregations.js

@@ -4,7 +4,7 @@ export class AggregationFeature {
         this.builder = builder;
     }
     createAggregation(column, fn, alias) {
-        const aggregationSQL = `${fn}(${String(column)}) AS ${alias}`;
+        const aggregationSQL = `${fn}(${column}) AS ${alias}`;
         const config = this.builder.getConfig();
         if (config.select) {
             return {
@@ -19,18 +19,18 @@ export class AggregationFeature {
         };
     }
     sum(column, alias) {
-        return this.createAggregation(column, 'SUM', alias || `${String(column)}_sum`);
+        return this.createAggregation(column, 'SUM', alias);
     }
     count(column, alias) {
-        return this.createAggregation(column, 'COUNT', alias || `${String(column)}_count`);
+        return this.createAggregation(column, 'COUNT', alias);
     }
     avg(column, alias) {
-        return this.createAggregation(column, 'AVG', alias || `${String(column)}_avg`);
+        return this.createAggregation(column, 'AVG', alias);
     }
     min(column, alias) {
-        return this.createAggregation(column, 'MIN', alias || `${String(column)}_min`);
+        return this.createAggregation(column, 'MIN', alias);
     }
     max(column, alias) {
-        return this.createAggregation(column, 'MAX', alias || `${String(column)}_max`);
+        return this.createAggregation(column, 'MAX', alias);
     }
 }

package/dist/core/features/analytics.d.ts

@@ -1,16 +1,12 @@
-import { QueryBuilder } from '../query-builder.js';
-import { ColumnType, TableColumn } from '../../types/schema.js';
 import { ClickHouseSettings } from '@clickhouse/client-common';
-export declare class AnalyticsFeature<Schema extends {
-    [tableName: string]: {
-        [columnName: string]: ColumnType;
-    };
-}, T, HasSelect extends boolean = false, Aggregations = {}, OriginalT = T> {
+import type { AnyBuilderState, BuilderState, SchemaDefinition } from '../types/builder-state.js';
+import { QueryBuilder } from '../query-builder.js';
+export declare class AnalyticsFeature<Schema extends SchemaDefinition<Schema>, State extends BuilderState<Schema, string, any, keyof Schema, Partial<Record<string, keyof Schema>>>> {
     private builder;
-    constructor(builder: QueryBuilder<Schema, T, HasSelect, Aggregations, OriginalT>);
-    addCTE(alias: string, subquery: QueryBuilder<any, any> | string): {
+    constructor(builder: QueryBuilder<Schema, State>);
+    addCTE(alias: string, subquery: QueryBuilder<any, AnyBuilderState> | string): {
         ctes: string[];
-        select?: (string | keyof T)[] | undefined;
+        select?: (string | keyof State["output"])[] | undefined;
         where?: import("../../types/base.js").WhereCondition[];
         groupBy?: string[];
         having?: string[];
@@ -18,7 +14,7 @@ export declare class AnalyticsFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | TableColumn<Schema>;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
             direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
@@ -26,16 +22,16 @@ export declare class AnalyticsFeature<Schema extends {
         unionQueries?: string[];
         settings?: string;
     };
-    addTimeInterval(column: keyof T | TableColumn<Schema>, interval: string, method: 'toStartOfInterval' | 'toStartOfMinute' | 'toStartOfHour' | 'toStartOfDay' | 'toStartOfWeek' | 'toStartOfMonth' | 'toStartOfQuarter' | 'toStartOfYear'): {
+    addTimeInterval(column: string, interval: string, method: 'toStartOfInterval' | 'toStartOfMinute' | 'toStartOfHour' | 'toStartOfDay' | 'toStartOfWeek' | 'toStartOfMonth' | 'toStartOfQuarter' | 'toStartOfYear'): {
         groupBy: string[];
-        select?: (string | keyof T)[] | undefined;
+        select?: (string | keyof State["output"])[] | undefined;
         where?: import("../../types/base.js").WhereCondition[];
         having?: string[];
         limit?: number;
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | TableColumn<Schema>;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
             direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
@@ -46,7 +42,7 @@ export declare class AnalyticsFeature<Schema extends {
     };
     addSettings(opts: ClickHouseSettings): {
         settings: string;
-        select?: (string | keyof T)[] | undefined;
+        select?: (string | keyof State["output"])[] | undefined;
         where?: import("../../types/base.js").WhereCondition[];
         groupBy?: string[];
         having?: string[];
@@ -54,7 +50,7 @@ export declare class AnalyticsFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | TableColumn<Schema>;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
             direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];

package/dist/core/features/analytics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../src/core/features/analytics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAE9D,qBAAa,gBAAgB,CAC3B,MAAM,SAAS;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAA;CAAE,EAC5E,CAAC,EACD,SAAS,SAAS,OAAO,GAAG,KAAK,EACjC,YAAY,GAAG,EAAE,EACjB,SAAS,GAAG,CAAC;IAED,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC;IAExF,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;;;;;;;;;;;;;;;;;;IAS/D,eAAe,CACb,MAAM,EAAE,MAAM,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,EACrC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,GAAG,iBAAiB,GAAG,eAAe,GAAG,cAAc,GAAG,eAAe,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,eAAe;;;;;;;;;;;;;;;;;;IAiBhK,WAAW,CAAC,IAAI,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;CAQrC"}
+{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../src/core/features/analytics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,CAAC,CAAC;IAExF,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAExD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,GAAG,EAAE,eAAe,CAAC,GAAG,MAAM;;;;;;;;;;;;;;;;;;IAS3E,eAAe,CACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,GAAG,iBAAiB,GAAG,eAAe,GAAG,cAAc,GAAG,eAAe,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,eAAe;;;;;;;;;;;;;;;;;;IAiBhK,WAAW,CAAC,IAAI,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;CAQrC"}

package/dist/core/features/analytics.js

@@ -15,10 +15,10 @@ export class AnalyticsFeature {
         const config = this.builder.getConfig();
         const groupBy = config.groupBy || [];
         if (method === 'toStartOfInterval') {
-            groupBy.push(`${method}(${String(column)}, INTERVAL ${interval})`);
+            groupBy.push(`${method}(${column}, INTERVAL ${interval})`);
         }
         else {
-            groupBy.push(`${method}(${String(column)})`);
+            groupBy.push(`${method}(${column})`);
         }
         return {
             ...config,

package/dist/core/features/cross-filtering.d.ts

@@ -1,27 +1,12 @@
+import type { BuilderState } from '../types/builder-state.js';
 import { QueryBuilder } from '../query-builder.js';
 import { CrossFilter } from '../cross-filter.js';
 import { AnySchema } from '../../types/schema.js';
-/**
- * Feature for handling cross-filter operations on queries
- */
-export declare class CrossFilteringFeature<Schema extends AnySchema, T, HasSelect extends boolean = false, Aggregations = {}, OriginalT = T> {
+export declare class CrossFilteringFeature<Schema extends AnySchema, State extends BuilderState<Schema, string, any, keyof Schema, Partial<Record<string, keyof Schema>>>> {
     private builder;
-    constructor(builder: QueryBuilder<Schema, T, HasSelect, Aggregations, OriginalT>);
-    /**
-     * Applies a set of cross filters to the query
-     * @param crossFilter - An instance of CrossFilter containing shared filter conditions
-     * @returns Updated query config
-     */
-    applyCrossFilters(crossFilter: CrossFilter<Schema, Extract<keyof Schema, string>>): import("../../types/base.js").QueryConfig<T, Schema>;
-    /**
-     * Apply AND conditions - each condition is applied with WHERE
-     */
+    constructor(builder: QueryBuilder<Schema, State>);
+    applyCrossFilters(crossFilter: CrossFilter<Schema, Extract<keyof Schema, string>>): import("../../types/base.js").QueryConfig<State["output"], Schema>;
     private applyAndConditions;
-    /**
-     * Apply direct OR conditions without adding extra conjunctions
-     * @param conditions The conditions to apply
-     * @param builder The builder to apply conditions to, defaults to this.builder
-     */
     private applyOrConditions;
 }
 //# sourceMappingURL=cross-filtering.d.ts.map

package/dist/core/features/cross-filtering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cross-filtering.d.ts","sourceRoot":"","sources":["../../../src/core/features/cross-filtering.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAe,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAe,MAAM,uBAAuB,CAAC;AAgB/D;;GAEG;AACH,qBAAa,qBAAqB,CAChC,MAAM,SAAS,SAAS,EACxB,CAAC,EACD,SAAS,SAAS,OAAO,GAAG,KAAK,EACjC,YAAY,GAAG,EAAE,EACjB,SAAS,GAAG,CAAC;IAED,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC;IAExF;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,MAAM,EAAE,MAAM,CAAC,CAAC;IAsBjF;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA4B1B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;CAqD1B"}
+{"version":3,"file":"cross-filtering.d.ts","sourceRoot":"","sources":["../../../src/core/features/cross-filtering.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAe,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAUlD,qBAAa,qBAAqB,CAChC,MAAM,SAAS,SAAS,EACxB,KAAK,SAAS,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,CAAC,CAAC;IAExF,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAExD,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,MAAM,EAAE,MAAM,CAAC,CAAC;IAkBjF,OAAO,CAAC,kBAAkB;IAwB1B,OAAO,CAAC,iBAAiB;CAkD1B"}

package/dist/core/features/cross-filtering.js

@@ -1,68 +1,43 @@
 //@ts-
-/**
- * Type guard to check if an object is a FilterConditionInput
- */
 function isFilterCondition(obj) {
     return obj && 'column' in obj && 'operator' in obj && 'value' in obj;
 }
-/**
- * Type guard to check if an object is a FilterGroup
- */
 function isFilterGroup(obj) {
     return obj && 'conditions' in obj && 'operator' in obj;
 }
-/**
- * Feature for handling cross-filter operations on queries
- */
 export class CrossFilteringFeature {
     builder;
     constructor(builder) {
         this.builder = builder;
     }
-    /**
-     * Applies a set of cross filters to the query
-     * @param crossFilter - An instance of CrossFilter containing shared filter conditions
-     * @returns Updated query config
-     */
     applyCrossFilters(crossFilter) {
         const filterGroup = crossFilter.getConditions();
         if (filterGroup.conditions.length === 0) {
             return this.builder.getConfig();
         }
-        // Apply conditions based on filter group operator
         if (filterGroup.operator === 'AND') {
-            // For AND groups, apply each condition directly
             this.applyAndConditions(filterGroup.conditions);
         }
         else {
-            // For OR groups, special handling to ensure proper parentheses
-            // We use whereGroup instead of orWhereGroup here since this is a top-level group
             this.builder.whereGroup(builder => {
                 this.applyOrConditions(filterGroup.conditions, builder);
             });
         }
         return this.builder.getConfig();
     }
-    /**
-     * Apply AND conditions - each condition is applied with WHERE
-     */
     applyAndConditions(conditions) {
         conditions.forEach(condition => {
             if (isFilterCondition(condition)) {
-                // Simple condition - apply with WHERE
                 this.builder.where(condition.column, condition.operator, condition.value);
             }
             else if (isFilterGroup(condition)) {
-                // Nested group
                 if (condition.operator === 'AND') {
-                    // AND subgroup - apply all conditions
                     this.builder.whereGroup(builder => {
                         const feature = new CrossFilteringFeature(builder);
                         feature.applyAndConditions(condition.conditions);
                     });
                 }
                 else {
-                    // OR subgroup within AND - needs special parentheses handling
                     this.builder.whereGroup(builder => {
                         const feature = new CrossFilteringFeature(builder);
                         feature.applyOrConditions(condition.conditions, builder);
@@ -71,21 +46,14 @@ export class CrossFilteringFeature {
             }
         });
     }
-    /**
-     * Apply direct OR conditions without adding extra conjunctions
-     * @param conditions The conditions to apply
-     * @param builder The builder to apply conditions to, defaults to this.builder
-     */
     applyOrConditions(conditions, builder = this.builder) {
         if (conditions.length === 0)
             return;
-        // Handle first condition
         const firstCondition = conditions[0];
         if (isFilterCondition(firstCondition)) {
             builder.where(firstCondition.column, firstCondition.operator, firstCondition.value);
         }
         else if (isFilterGroup(firstCondition)) {
-            // Handle nested group
             if (firstCondition.operator === 'AND') {
                 builder.whereGroup(innerBuilder => {
                     const feature = new CrossFilteringFeature(innerBuilder);
@@ -99,7 +67,6 @@ export class CrossFilteringFeature {
                 });
             }
         }
-        // Handle remaining conditions
         for (let i = 1; i < conditions.length; i++) {
             const condition = conditions[i];
             if (isFilterCondition(condition)) {

package/dist/core/features/executor.d.ts

@@ -1,19 +1,15 @@
+import type { BuilderState, SchemaDefinition } from '../types/builder-state.js';
 import { QueryBuilder } from '../query-builder.js';
-import { ColumnType } from '../../types/schema.js';
-export declare class ExecutorFeature<Schema extends {
-    [tableName: string]: {
-        [columnName: string]: ColumnType;
-    };
-}, T, HasSelect extends boolean = false, Aggregations = {}, OriginalT = T> {
+export declare class ExecutorFeature<Schema extends SchemaDefinition<Schema>, State extends BuilderState<Schema, string, any, keyof Schema, Partial<Record<string, keyof Schema>>>> {
     private builder;
-    constructor(builder: QueryBuilder<Schema, T, HasSelect, Aggregations, OriginalT>);
+    constructor(builder: QueryBuilder<Schema, State>);
     toSQLWithParams(): {
         sql: string;
         parameters: any[];
     };
     toSQL(): string;
-    execute(): Promise<T[]>;
-    stream(): Promise<ReadableStream<T[]>>;
+    execute(): Promise<State['output'][]>;
+    stream(): Promise<ReadableStream<State['output'][]>>;
     private toSQLWithoutParameters;
 }
 //# sourceMappingURL=executor.d.ts.map

package/dist/core/features/executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/core/features/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAKnD,qBAAa,eAAe,CAC1B,MAAM,SAAS;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAA;CAAE,EAC5E,CAAC,EACD,SAAS,SAAS,OAAO,GAAG,KAAK,EACjC,YAAY,GAAG,EAAE,EACjB,SAAS,GAAG,CAAC;IAED,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC;IAExF,eAAe,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,GAAG,EAAE,CAAA;KAAE;IAOrD,KAAK,IAAI,MAAM;IAKT,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC;IAgDvB,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IA+C5C,OAAO,CAAC,sBAAsB;CA0C/B"}
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/core/features/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAKnD,qBAAa,eAAe,CAC1B,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,CAAC,CAAC;IAExF,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAExD,eAAe,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,GAAG,EAAE,CAAA;KAAE;IAOrD,KAAK,IAAI,MAAM;IAKT,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;IAgDrC,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IA+C1D,OAAO,CAAC,sBAAsB;CA0C/B"}

package/dist/core/features/filtering.d.ts

@@ -1,25 +1,21 @@
+import type { BuilderState, SchemaDefinition } from '../types/builder-state.js';
 import { QueryBuilder } from '../query-builder.js';
 import { FilterOperator } from '../../types/index.js';
-import { ColumnType, TableColumn } from '../../types/schema.js';
 import { PredicateExpression } from '../utils/predicate-builder.js';
-export declare class FilteringFeature<Schema extends {
-    [tableName: string]: {
-        [columnName: string]: ColumnType;
-    };
-}, T, HasSelect extends boolean = false, Aggregations = {}, OriginalT = T> {
+export declare class FilteringFeature<Schema extends SchemaDefinition<Schema>, State extends BuilderState<Schema, string, any, keyof Schema, Partial<Record<string, keyof Schema>>>> {
     private builder;
-    constructor(builder: QueryBuilder<Schema, T, HasSelect, Aggregations, OriginalT>);
-    addCondition<K extends keyof OriginalT | TableColumn<Schema>>(conjunction: 'AND' | 'OR', column: K | K[], operator: FilterOperator, value: any): {
+    constructor(builder: QueryBuilder<Schema, State>);
+    addCondition(conjunction: 'AND' | 'OR', column: string | string[], operator: FilterOperator, value: any): {
         where: import("../../types/base.js").WhereCondition[];
         parameters: any[];
-        select?: (string | keyof T)[] | undefined;
+        select?: (string | keyof State["output"])[] | undefined;
         groupBy?: string[];
         having?: string[];
         limit?: number;
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: TableColumn<Schema> | keyof T;
+            column: keyof State["output"] | import("../../types/schema.js").TableColumn<Schema>;
             direction: import("../../types/base.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
@@ -30,14 +26,14 @@ export declare class FilteringFeature<Schema extends {
     addExpressionCondition(conjunction: 'AND' | 'OR', expression: PredicateExpression): {
         where: import("../../types/base.js").WhereCondition[];
         parameters: any[];
-        select?: (string | keyof T)[] | undefined;
+        select?: (string | keyof State["output"])[] | undefined;
         groupBy?: string[];
         having?: string[];
         limit?: number;
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: TableColumn<Schema> | keyof T;
+            column: keyof State["output"] | import("../../types/schema.js").TableColumn<Schema>;
             direction: import("../../types/base.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
@@ -45,20 +41,16 @@ export declare class FilteringFeature<Schema extends {
         unionQueries?: string[];
         settings?: string;
     };
-    /**
-     * Adds a group-start marker to start a parenthesized group of conditions with AND conjunction
-     * @returns The updated query config
-     */
     startWhereGroup(): {
         where: import("../../types/base.js").WhereCondition[];
-        select?: (string | keyof T)[] | undefined;
+        select?: (string | keyof State["output"])[] | undefined;
         groupBy?: string[];
         having?: string[];
         limit?: number;
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: TableColumn<Schema> | keyof T;
+            column: keyof State["output"] | import("../../types/schema.js").TableColumn<Schema>;
             direction: import("../../types/base.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
@@ -67,20 +59,16 @@ export declare class FilteringFeature<Schema extends {
         unionQueries?: string[];
         settings?: string;
     };
-    /**
-     * Adds a group-start marker to start a parenthesized group of conditions with OR conjunction
-     * @returns The updated query config
-     */
     startOrWhereGroup(): {
         where: import("../../types/base.js").WhereCondition[];
-        select?: (string | keyof T)[] | undefined;
+        select?: (string | keyof State["output"])[] | undefined;
         groupBy?: string[];
         having?: string[];
         limit?: number;
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: TableColumn<Schema> | keyof T;
+            column: keyof State["output"] | import("../../types/schema.js").TableColumn<Schema>;
             direction: import("../../types/base.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
@@ -89,20 +77,16 @@ export declare class FilteringFeature<Schema extends {
         unionQueries?: string[];
         settings?: string;
     };
-    /**
-     * Adds a group-end marker to end a parenthesized group of conditions
-     * @returns The updated query config
-     */
     endWhereGroup(): {
         where: import("../../types/base.js").WhereCondition[];
-        select?: (string | keyof T)[] | undefined;
+        select?: (string | keyof State["output"])[] | undefined;
         groupBy?: string[];
         having?: string[];
         limit?: number;
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: TableColumn<Schema> | keyof T;
+            column: keyof State["output"] | import("../../types/schema.js").TableColumn<Schema>;
             direction: import("../../types/base.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];

package/dist/core/features/filtering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filtering.d.ts","sourceRoot":"","sources":["../../../src/core/features/filtering.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,qBAAa,gBAAgB,CAC3B,MAAM,SAAS;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAA;CAAE,EAC5E,CAAC,EACD,SAAS,SAAS,OAAO,GAAG,KAAK,EACjC,YAAY,GAAG,EAAE,EACjB,SAAS,GAAG,CAAC;IAED,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC;IAExF,YAAY,CAAC,CAAC,SAAS,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,EAC1D,WAAW,EAAE,KAAK,GAAG,IAAI,EACzB,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,EACf,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,GAAG;;;;;;;;;;;;;;;;;;IA4DZ,sBAAsB,CACpB,WAAW,EAAE,KAAK,GAAG,IAAI,EACzB,UAAU,EAAE,mBAAmB;;;;;;;;;;;;;;;;;;IAsBjC;;;OAGG;IACH,eAAe;;;;;;;;;;;;;;;;;;IAkBf;;;OAGG;IACH,iBAAiB;;;;;;;;;;;;;;;;;;IAkBjB;;;OAGG;IACH,aAAa;;;;;;;;;;;;;;;;;;CAiBd"}
+{"version":3,"file":"filtering.d.ts","sourceRoot":"","sources":["../../../src/core/features/filtering.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,qBAAa,gBAAgB,CAC3B,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,CAAC,CAAC;IAExF,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAExD,YAAY,CACV,WAAW,EAAE,KAAK,GAAG,IAAI,EACzB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,EACzB,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,GAAG;;;;;;;;;;;;;;;;;;IAwDZ,sBAAsB,CACpB,WAAW,EAAE,KAAK,GAAG,IAAI,EACzB,UAAU,EAAE,mBAAmB;;;;;;;;;;;;;;;;;;IAsBjC,eAAe;;;;;;;;;;;;;;;;;;IAkBf,iBAAiB;;;;;;;;;;;;;;;;;;IAkBjB,aAAa;;;;;;;;;;;;;;;;;;CAiBd"}