@hypequery/clickhouse 1.3.1-beta.0 → 1.3.2

package/README.md

@@ -184,8 +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)
@@ -250,4 +267,4 @@ This project is licensed under the Apache-2.0 License - see the [LICENSE](LICENS
 
 <div align="center">
   <sub>Built with ❤️ by the hypequery team</sub>
-</div> 
+</div> 

package/dist/cli/generate-types.js

@@ -35,6 +35,40 @@ const clickhouseToTsType = (type) => {
     return `${clickhouseToTsType(innerType)} | null`;
   }
 
+  // Handle Map types
+  if (type.startsWith('Map(')) {
+    // Extract key and value types from Map(KeyType, ValueType)
+    const mapContent = type.slice(4, -1); // Remove 'Map(' and ')'
+    const commaIndex = mapContent.lastIndexOf(',');
+    if (commaIndex !== -1) {
+      const keyType = mapContent.substring(0, commaIndex).trim();
+      const valueType = mapContent.substring(commaIndex + 1).trim();
+
+      // Handle different key types
+      let keyTsType = 'string';
+      if (keyType === 'LowCardinality(String)') {
+        keyTsType = 'string';
+      } else if (keyType.includes('Int') || keyType.includes('UInt')) {
+        keyTsType = 'number';
+      }
+
+      // Handle different value types
+      let valueTsType = 'unknown';
+      if (valueType.startsWith('Array(')) {
+        const innerType = valueType.slice(6, -1);
+        valueTsType = `Array<${clickhouseToTsType(innerType)}>`;
+      } else if (valueType.startsWith('Nullable(')) {
+        const innerType = valueType.slice(9, -1);
+        valueTsType = `${clickhouseToTsType(innerType)} | null`;
+      } else {
+        valueTsType = clickhouseToTsType(valueType);
+      }
+
+      return `Record<${keyTsType}, ${valueTsType}>`;
+    }
+    return 'Record<string, unknown>';
+  }
+
   switch (type.toLowerCase()) {
     case 'string':
     case 'fixedstring':
@@ -43,12 +77,16 @@ const clickhouseToTsType = (type) => {
     case 'int16':
     case 'int32':
     case 'uint8':
+    case 'int64':
     case 'uint16':
     case 'uint32':
-      return 'number';
-    case 'int64':
     case 'uint64':
-      return 'string'; // Use string for 64-bit integers to avoid precision loss
+      return 'number';
+    case 'uint128':
+    case 'uint256':
+    case 'int128':
+    case 'int256':
+      return 'string';
     case 'float32':
     case 'float64':
     case 'decimal':

package/dist/core/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/core/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,KAAK,EAAE,gBAAgB,IAAI,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAEtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAI3D,KAAK,gBAAgB,GAAG,oBAAoB,GAAG,mBAAmB,CAAC;AAqCnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiC;IACxD,OAAO,CAAC,MAAM,CAAC,YAAY,CAAuC;IAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,oBAAoB;IAaxE;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,SAAS,IAAI,gBAAgB;IAOpC;;;;;OAKG;IACH,MAAM,CAAC,qBAAqB,IAAI,kBAAkB;CAGnD"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/core/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,KAAK,EAAE,gBAAgB,IAAI,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAM3D,KAAK,gBAAgB,GAAG,oBAAoB,GAAG,mBAAmB,CAAC;AAsCnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiC;IACxD,OAAO,CAAC,MAAM,CAAC,YAAY,CAAuC;IAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,oBAAoB;IAaxE;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,SAAS,IAAI,gBAAgB;IAOpC;;;;;OAKG;IACH,MAAM,CAAC,qBAAqB,IAAI,kBAAkB;CAGnD"}

package/dist/core/connection.js

@@ -1,5 +1,5 @@
-import { createClient as createNodeClient } from '@clickhouse/client';
 import { isClientConfig } from './query-builder.js';
+import { getAutoClientModule } from './env/auto-client.js';
 // Function to synchronously get the appropriate client
 function getClickHouseClientSync() {
     const isDev = process.env.NODE_ENV === 'development';
@@ -9,9 +9,10 @@ function getClickHouseClientSync() {
         if (isDev) {
             console.log('hypequery: Using @clickhouse/client for Node.js environment');
         }
+        const clientModule = getAutoClientModule();
         return {
-            createClient: createNodeClient,
-            ClickHouseSettings: {}
+            createClient: clientModule.createClient,
+            ClickHouseSettings: clientModule.ClickHouseSettings || {}
         };
     }
     // For browser environments, require() doesn't work, so we can't auto-detect

package/dist/core/cross-filter.d.ts

@@ -1,6 +1,6 @@
 import { FilterConditionInput, FilterOperator, OperatorValueMap } from '../types/index.js';
-import type { ColumnType, InferColumnType } from '../types/index.js';
-export interface FilterGroup<Schema extends Record<string, Record<string, any>> = any, OriginalT extends Record<string, any> = any> {
+import type { AnySchema, InferColumnType } from '../types/schema.js';
+export interface FilterGroup<Schema extends AnySchema = AnySchema, OriginalT extends Record<string, any> = Record<string, any>> {
     operator: 'AND' | 'OR';
     conditions: Array<FilterConditionInput<any, Schema, OriginalT> | FilterGroup<Schema, OriginalT>>;
     limit?: number;
@@ -14,11 +14,7 @@ export interface FilterGroup<Schema extends Record<string, Record<string, any>>
  * @template Schema - The full database schema type
  * @template TableName - The specific table being filtered
  */
-export declare class CrossFilter<Schema extends {
-    [tableName: string]: {
-        [columnName: string]: ColumnType;
-    };
-} = any, TableName extends keyof Schema = Extract<keyof Schema, string>> {
+export declare class CrossFilter<Schema extends AnySchema = AnySchema, TableName extends keyof Schema & string = Extract<keyof Schema, string>> {
     private schema?;
     private rootGroup;
     constructor(schema?: Schema | undefined);

package/dist/core/cross-filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cross-filter.d.ts","sourceRoot":"","sources":["../../src/core/cross-filter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGrE,MAAM,WAAW,WAAW,CAC1B,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,GAAG,EACxD,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG;IAE3C,QAAQ,EAAE,KAAK,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,KAAK,CACf,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAC9E,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,MAAM,SAAS,CAAC;QACxB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;KAC3B,CAAC;CACH;AAED;;;;GAIG;AACH,qBAAa,WAAW,CACtB,MAAM,SAAS;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAA;CAAE,GAAG,GAAG,EAClF,SAAS,SAAS,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,MAAM,EAAE,MAAM,CAAC;IAMlD,OAAO,CAAC,MAAM,CAAC;IAH3B,OAAO,CAAC,SAAS,CAAyC;gBAGtC,MAAM,CAAC,EAAE,MAAM,YAAA;IAInC;;;OAGG;IACH,GAAG,CACD,UAAU,SAAS,OAAO,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,EAC3D,EAAE,SAAS,cAAc,EAEzB,SAAS,EAAE,oBAAoB,CAC7B,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EACpE,MAAM,EACN,MAAM,CAAC,SAAS,CAAC,CAClB,GACA,IAAI;IA0BP;;OAEG;IACH,WAAW,CACT,UAAU,EAAE,KAAK,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,GACtE,IAAI;IAQP;;;;OAIG;IACH,QAAQ,CACN,eAAe,EAAE,KAAK,CACpB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAC9F,EACD,QAAQ,EAAE,KAAK,GAAG,IAAI,GACrB,IAAI;IAYP;;OAEG;IACH,aAAa,IAAI,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAIvD;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAarB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAazB;;OAEG;IACH,OAAO,CAAC,aAAa;IAqBrB;;OAEG;IACH,OAAO,CAAC,OAAO;IAMf;;;;;OAKG;IACH,IAAI,CAAC,CAAC,SAAS,MAAM,MAAM,CAAC,SAAS,CAAC,EACpC,WAAW,EAAE,CAAC,EACd,CAAC,EAAE,MAAM,EACT,OAAO,GAAE,MAAM,GAAG,KAAc,GAC/B,IAAI;CAmBR"}
+{"version":3,"file":"cross-filter.d.ts","sourceRoot":"","sources":["../../src/core/cross-filter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,KAAK,EAAE,SAAS,EAAc,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGjF,MAAM,WAAW,WAAW,CAC1B,MAAM,SAAS,SAAS,GAAG,SAAS,EACpC,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAE3D,QAAQ,EAAE,KAAK,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,KAAK,CACf,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAC9E,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,MAAM,SAAS,CAAC;QACxB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;KAC3B,CAAC;CACH;AAED;;;;GAIG;AACH,qBAAa,WAAW,CACtB,MAAM,SAAS,SAAS,GAAG,SAAS,EACpC,SAAS,SAAS,MAAM,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,MAAM,EAAE,MAAM,CAAC;IAM3D,OAAO,CAAC,MAAM,CAAC;IAH3B,OAAO,CAAC,SAAS,CAAyC;gBAGtC,MAAM,CAAC,EAAE,MAAM,YAAA;IAInC;;;OAGG;IACH,GAAG,CACD,UAAU,SAAS,OAAO,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,EAC3D,EAAE,SAAS,cAAc,EAEzB,SAAS,EAAE,oBAAoB,CAC7B,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EACpE,MAAM,EACN,MAAM,CAAC,SAAS,CAAC,CAClB,GACA,IAAI;IA0BP;;OAEG;IACH,WAAW,CACT,UAAU,EAAE,KAAK,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,GACtE,IAAI;IAQP;;;;OAIG;IACH,QAAQ,CACN,eAAe,EAAE,KAAK,CACpB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAC9F,EACD,QAAQ,EAAE,KAAK,GAAG,IAAI,GACrB,IAAI;IAYP;;OAEG;IACH,aAAa,IAAI,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAIvD;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAcrB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAazB;;OAEG;IACH,OAAO,CAAC,aAAa;IAqBrB;;OAEG;IACH,OAAO,CAAC,OAAO;IAMf;;;;;OAKG;IACH,IAAI,CAAC,CAAC,SAAS,MAAM,MAAM,CAAC,SAAS,CAAC,EACpC,WAAW,EAAE,CAAC,EACd,CAAC,EAAE,MAAM,EACT,OAAO,GAAE,MAAM,GAAG,KAAc,GAC/B,IAAI;CAmBR"}

package/dist/core/cross-filter.js

@@ -77,10 +77,11 @@ export class CrossFilter {
         if (!this.schema) {
             return 'String';
         }
-        for (const table in this.schema) {
+        for (const table of Object.keys(this.schema)) {
             const tableSchema = this.schema[table];
             if (column in tableSchema) {
-                return tableSchema[column];
+                const columnKey = column;
+                return tableSchema[columnKey];
             }
         }
         throw new Error(`Column '${column}' not found in schema`);

package/dist/core/env/auto-client.browser.d.ts

@@ -0,0 +1,3 @@
+import type { AutoClientModule } from './auto-client.js';
+export declare function getAutoClientModule(): AutoClientModule;
+//# sourceMappingURL=auto-client.browser.d.ts.map

package/dist/core/env/auto-client.browser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-client.browser.d.ts","sourceRoot":"","sources":["../../../src/core/env/auto-client.browser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,wBAAgB,mBAAmB,IAAI,gBAAgB,CAEtD"}

package/dist/core/env/auto-client.browser.js

@@ -0,0 +1,3 @@
+export function getAutoClientModule() {
+    throw new Error('Auto-detecting a ClickHouse client is not supported in browser environments.');
+}

package/dist/core/env/auto-client.d.ts

@@ -0,0 +1,9 @@
+import type { ClickHouseSettings } from '@clickhouse/client-common';
+type NodeClientModule = typeof import('@clickhouse/client');
+export interface AutoClientModule {
+    createClient: NodeClientModule['createClient'];
+    ClickHouseSettings?: ClickHouseSettings;
+}
+export declare function getAutoClientModule(): AutoClientModule;
+export {};
+//# sourceMappingURL=auto-client.d.ts.map

package/dist/core/env/auto-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-client.d.ts","sourceRoot":"","sources":["../../../src/core/env/auto-client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,KAAK,gBAAgB,GAAG,cAAc,oBAAoB,CAAC,CAAC;AAE5D,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC/C,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC;AAID,wBAAgB,mBAAmB,IAAI,gBAAgB,CAqBtD"}

package/dist/core/env/auto-client.js

@@ -0,0 +1,21 @@
+import { createRequire } from 'module';
+let cachedModule;
+export function getAutoClientModule() {
+    if (!cachedModule) {
+        try {
+            const nodeRequire = createRequire(`${process.cwd()}/noop.js`);
+            const clientModule = nodeRequire('@clickhouse/client');
+            const settings = clientModule.ClickHouseSettings;
+            cachedModule = {
+                createClient: clientModule.createClient,
+                ClickHouseSettings: settings ?? {}
+            };
+        }
+        catch (error) {
+            throw new Error('@clickhouse/client is required for Node.js environments.\n\n' +
+                'Install with: npm install @clickhouse/client\n\n' +
+                'Alternatively, you can provide a client instance directly in the config.client option.', { cause: error instanceof Error ? error : undefined });
+        }
+    }
+    return cachedModule;
+}

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/index.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,8 +13,8 @@ export declare class AggregationFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | import("../../types/base.js").TableColumn<Schema>;
-            direction: import("../../types/base.js").OrderDirection;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
+            direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
         parameters?: any[];
@@ -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,8 +31,8 @@ export declare class AggregationFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | import("../../types/base.js").TableColumn<Schema>;
-            direction: import("../../types/base.js").OrderDirection;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
+            direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
         parameters?: any[];
@@ -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,8 +49,8 @@ export declare class AggregationFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | import("../../types/base.js").TableColumn<Schema>;
-            direction: import("../../types/base.js").OrderDirection;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
+            direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
         parameters?: any[];
@@ -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,8 +67,8 @@ export declare class AggregationFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | import("../../types/base.js").TableColumn<Schema>;
-            direction: import("../../types/base.js").OrderDirection;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
+            direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
         parameters?: any[];
@@ -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,8 +85,8 @@ export declare class AggregationFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | import("../../types/base.js").TableColumn<Schema>;
-            direction: import("../../types/base.js").OrderDirection;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
+            direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
         parameters?: any[];

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,sBAAsB,CAAC;AAElD,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/index.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,25 +14,25 @@ export declare class AnalyticsFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | TableColumn<Schema>;
-            direction: import("../../types/base.js").OrderDirection;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
+            direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
         parameters?: any[];
         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>;
-            direction: import("../../types/base.js").OrderDirection;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
+            direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
         parameters?: any[];
@@ -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,8 +50,8 @@ export declare class AnalyticsFeature<Schema extends {
         offset?: number;
         distinct?: boolean;
         orderBy?: {
-            column: keyof T | TableColumn<Schema>;
-            direction: import("../../types/base.js").OrderDirection;
+            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
+            direction: import("../../index.js").OrderDirection;
         }[] | undefined;
         joins?: import("../../types/base.js").JoinClause[];
         parameters?: any[];

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,sBAAsB,CAAC;AAC/D,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,31 +1,12 @@
+import type { BuilderState } from '../types/builder-state.js';
 import { QueryBuilder } from '../query-builder.js';
 import { CrossFilter } from '../cross-filter.js';
-import { ColumnType } from '../../types/index.js';
-/**
- * Feature for handling cross-filter operations on queries
- */
-export declare class CrossFilteringFeature<Schema extends {
-    [tableName: string]: {
-        [columnName: string]: ColumnType;
-    };
-}, T, HasSelect extends boolean = false, Aggregations = {}, OriginalT = T> {
+import { AnySchema } from '../../types/schema.js';
+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, keyof Schema>): 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;AAC9D,OAAO,EAAwB,UAAU,EAAe,MAAM,sBAAsB,CAAC;AAgBrF;;GAEG;AACH,qBAAa,qBAAqB,CAChC,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;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC;IAsBhE;;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)) {