@hypequery/clickhouse 1.6.2 → 2.0.1

package/dist/core/cache/cache-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache-manager.d.ts","sourceRoot":"","sources":["../../../src/core/cache/cache-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AA4DnF,wBAAsB,gBAAgB,CACpC,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,eAAe,EAE7B,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,EACpC,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CA4J5B"}
+{"version":3,"file":"cache-manager.d.ts","sourceRoot":"","sources":["../../../src/core/cache/cache-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AA6DnF,wBAAsB,gBAAgB,CACpC,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,eAAe,EAE7B,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,EACpC,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CA6J5B"}

package/dist/core/cache/cache-manager.js

@@ -8,9 +8,10 @@ function isCacheable(options) {
     return ttl > 0 || stale > 0;
 }
 function deriveTags(builder) {
+    const queryNode = builder.toQueryNode();
     const tags = new Set();
-    tags.add(builder.getTableName());
-    const joins = builder.getConfig().joins || [];
+    tags.add(queryNode.from?.kind === 'table' ? queryNode.from.name : builder.getTableName());
+    const joins = queryNode.joins || [];
     joins.forEach(join => tags.add(join.table));
     return Array.from(tags);
 }
@@ -49,11 +50,12 @@ export async function executeWithCache(builder, options) {
     const renderSql = adapter.render ? adapter.render(sql, parameters) : substituteParameters(sql, parameters);
     const tableName = builder.getTableName();
     const namespace = mergedOptions.namespace || runtime.namespace;
+    const queryNode = builder.toQueryNode();
     const key = mergedOptions.key || computeCacheKey({
         namespace,
         sql,
         parameters,
-        settings: builder.getConfig().settings,
+        settings: queryNode.settings,
         version: runtime.versionTag,
         tableName
     });

package/dist/core/connection.d.ts

@@ -17,20 +17,20 @@ type ClickHouseClient = NodeClickHouseClient | WebClickHouseClient;
  * // Method 1: Manual injection (required for browser environments)
  * import { createClient } from '@clickhouse/client-web';
  * const client = createClient({
- *   host: 'http://localhost:8123',
+ *   url: 'http://localhost:8123',
  *   username: 'default',
  *   password: 'password'
  * });
  *
  * ClickHouseConnection.initialize({
- *   host: 'http://localhost:8123',
+ *   url: 'http://localhost:8123',
  *   database: 'my_database',
  *   client // Explicitly provide the client
  * });
  *
  * // Method 2: Auto-detection (Node.js environments only)
  * ClickHouseConnection.initialize({
- *   host: 'http://localhost:8123',
+ *   url: 'http://localhost:8123',
  *   username: 'default',
  *   password: 'password',
  *   database: 'my_database'
@@ -71,12 +71,12 @@ export declare class ClickHouseConnection {
      * ```typescript
      * // Manual injection (required for browser environments)
      * import { createClient } from '@clickhouse/client-web';
-     * const client = createClient({ host: 'http://localhost:8123' });
-     * ClickHouseConnection.initialize({ host: 'http://localhost:8123', client });
+     * const client = createClient({ url: 'http://localhost:8123' });
+     * ClickHouseConnection.initialize({ url: 'http://localhost:8123', client });
      *
      * // Auto-detection (Node.js environments only)
      * ClickHouseConnection.initialize({
-     *   host: 'http://localhost:8123',
+     *   url: 'http://localhost:8123',
      *   username: 'default',
      *   password: 'password',
      *   database: 'my_database'

package/dist/core/connection.js

@@ -21,8 +21,8 @@ function getClickHouseClientSync() {
         'Please use manual injection by providing a client instance:\n\n' +
         '```typescript\n' +
         'import { createClient } from \'@clickhouse/client-web\';\n' +
-        'const client = createClient({ host: \'http://localhost:8123\' });\n' +
-        'ClickHouseConnection.initialize({ host: \'http://localhost:8123\', client });\n' +
+        'const client = createClient({ url: \'http://localhost:8123\' });\n' +
+        'ClickHouseConnection.initialize({ url: \'http://localhost:8123\', client });\n' +
         '```\n\n' +
         'This is required because browser environments cannot use require() to load modules.');
 }
@@ -40,20 +40,20 @@ function getClickHouseClientSync() {
  * // Method 1: Manual injection (required for browser environments)
  * import { createClient } from '@clickhouse/client-web';
  * const client = createClient({
- *   host: 'http://localhost:8123',
+ *   url: 'http://localhost:8123',
  *   username: 'default',
  *   password: 'password'
  * });
  *
  * ClickHouseConnection.initialize({
- *   host: 'http://localhost:8123',
+ *   url: 'http://localhost:8123',
  *   database: 'my_database',
  *   client // Explicitly provide the client
  * });
  *
  * // Method 2: Auto-detection (Node.js environments only)
  * ClickHouseConnection.initialize({
- *   host: 'http://localhost:8123',
+ *   url: 'http://localhost:8123',
  *   username: 'default',
  *   password: 'password',
  *   database: 'my_database'
@@ -94,12 +94,12 @@ export class ClickHouseConnection {
      * ```typescript
      * // Manual injection (required for browser environments)
      * import { createClient } from '@clickhouse/client-web';
-     * const client = createClient({ host: 'http://localhost:8123' });
-     * ClickHouseConnection.initialize({ host: 'http://localhost:8123', client });
+     * const client = createClient({ url: 'http://localhost:8123' });
+     * ClickHouseConnection.initialize({ url: 'http://localhost:8123', client });
      *
      * // Auto-detection (Node.js environments only)
      * ClickHouseConnection.initialize({
-     *   host: 'http://localhost:8123',
+     *   url: 'http://localhost:8123',
      *   username: 'default',
      *   password: 'password',
      *   database: 'my_database'
@@ -112,7 +112,7 @@ export class ClickHouseConnection {
             this.instance = config.client;
             return ClickHouseConnection;
         }
-        // Otherwise, auto-detect the client (we know we have a host-based config)
+        // Otherwise, auto-detect the client using the provided ClickHouse connection config.
         this.clientModule = getClickHouseClientSync();
         this.instance = this.clientModule.createClient(config);
         return ClickHouseConnection;

package/dist/core/cross-filter.js

@@ -114,7 +114,7 @@ export class CrossFilter {
      * Type guard to check if an item is a FilterGroup.
      */
     isGroup(item) {
-        return typeof item.conditions !== 'undefined';
+        return 'conditions' in item;
     }
     /**
      * Creates a filter for top N records by a value column

package/dist/core/dialects/clickhouse-dialect.d.ts

@@ -1,9 +1,9 @@
-import type { QueryConfig } from '../../types/index.js';
+import type { CompiledQuery, SelectQueryNode } from '../../types/index.js';
 import type { CompileQueryContext, SqlDialect } from './sql-dialect.js';
 export declare class ClickHouseDialect implements SqlDialect {
     readonly name = "clickhouse";
     private formatter;
-    compileQuery(config: QueryConfig<any, any>, context: CompileQueryContext): string;
+    compileQuery(query: SelectQueryNode<any, any>, context: CompileQueryContext): CompiledQuery;
     formatTimeInterval(column: string, interval: string, method: string): string;
     formatSettings(settings: Record<string, unknown>): string;
 }

package/dist/core/dialects/clickhouse-dialect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse-dialect.d.ts","sourceRoot":"","sources":["../../../src/core/dialects/clickhouse-dialect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAExE,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,OAAO,CAAC,SAAS,CAAsB;IAEvC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,mBAAmB,GAAG,MAAM;IAyCjF,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAQ5E,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;CAK1D"}
+{"version":3,"file":"clickhouse-dialect.d.ts","sourceRoot":"","sources":["../../../src/core/dialects/clickhouse-dialect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAExE,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,OAAO,CAAC,SAAS,CAAsB;IAEvC,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,mBAAmB,GAAG,aAAa;IA6D3F,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAQ5E,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;CAK1D"}

package/dist/core/dialects/clickhouse-dialect.js

@@ -2,36 +2,53 @@ import { SQLFormatter } from '../formatters/sql-formatter.js';
 export class ClickHouseDialect {
     name = 'clickhouse';
     formatter = new SQLFormatter();
-    compileQuery(config, context) {
+    compileQuery(query, context) {
         const parts = [];
-        if (config.ctes?.length) {
-            parts.push(`WITH ${config.ctes.join(', ')}`);
+        const parameters = [];
+        if (query.ctes?.length) {
+            parts.push(`WITH ${this.formatter.formatCtes(query)}`);
         }
-        parts.push(`SELECT ${this.formatter.formatSelect(config)}`);
-        parts.push(`FROM ${context.tableName}`);
-        if (config.joins?.length) {
-            parts.push(this.formatter.formatJoins(config));
+        parts.push(`SELECT ${this.formatter.formatSelect(query)}`);
+        parts.push(`FROM ${this.formatter.formatFrom(query.from ?? { kind: 'table', name: context.tableName })}`);
+        if (query.arrayJoins?.length) {
+            parts.push(this.formatter.formatArrayJoins(query));
         }
-        if (config.where?.length) {
-            parts.push(`WHERE ${this.formatter.formatWhere(config)}`);
+        if (query.joins?.length) {
+            parts.push(this.formatter.formatJoins(query));
         }
-        if (config.groupBy?.length) {
-            parts.push(`GROUP BY ${this.formatter.formatGroupBy(config)}`);
+        if (query.prewhere) {
+            const compiled = this.formatter.compileExpr(query.prewhere);
+            parts.push(`PREWHERE ${compiled.query}`);
+            parameters.push(...compiled.parameters);
         }
-        if (config.having?.length) {
-            parts.push(`HAVING ${config.having.join(' AND ')}`);
+        if (query.where) {
+            const compiled = this.formatter.compileExpr(query.where);
+            parts.push(`WHERE ${compiled.query}`);
+            parameters.push(...compiled.parameters);
         }
-        if (config.orderBy?.length) {
-            const orderBy = config.orderBy
-                .map(({ column, direction }) => `${String(column)} ${direction}`.trim())
-                .join(', ');
-            parts.push(`ORDER BY ${orderBy}`);
+        if (query.groupBy?.length) {
+            const groupByClause = `GROUP BY ${this.formatter.formatGroupBy(query)}`;
+            parts.push(query.withTotals ? `${groupByClause} WITH TOTALS` : groupByClause);
         }
-        if (config.limit) {
-            const offsetClause = config.offset ? `OFFSET ${config.offset}` : '';
-            parts.push(`LIMIT ${config.limit} ${offsetClause}`);
+        if (query.having?.length) {
+            const compiled = this.formatter.compileHaving(query);
+            parts.push(`HAVING ${compiled.query}`);
+            parameters.push(...compiled.parameters);
         }
-        return parts.join(' ').trim();
+        if (query.orderBy?.length) {
+            parts.push(`ORDER BY ${this.formatter.formatOrderBy(query)}`);
+        }
+        if (query.limitBy) {
+            parts.push(`LIMIT ${this.formatter.formatLimitBy(query)}`);
+        }
+        if (query.limit) {
+            const offsetClause = query.offset ? `OFFSET ${query.offset}` : '';
+            parts.push(`LIMIT ${query.limit} ${offsetClause}`);
+        }
+        return {
+            query: parts.join(' ').trim(),
+            parameters,
+        };
     }
     formatTimeInterval(column, interval, method) {
         if (method === 'toStartOfInterval') {

package/dist/core/dialects/sql-dialect.d.ts

@@ -1,10 +1,10 @@
-import type { QueryConfig } from '../../types/index.js';
+import type { CompiledQuery, SelectQueryNode } from '../../types/index.js';
 export interface CompileQueryContext {
     tableName: string;
 }
 export interface SqlDialect {
     readonly name: string;
-    compileQuery(config: QueryConfig<any, any>, context: CompileQueryContext): string;
+    compileQuery(query: SelectQueryNode<any, any>, context: CompileQueryContext): CompiledQuery;
     formatTimeInterval(column: string, interval: string, method: string): string;
     formatSettings(settings: Record<string, unknown>): string;
 }

package/dist/core/dialects/sql-dialect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql-dialect.d.ts","sourceRoot":"","sources":["../../../src/core/dialects/sql-dialect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAAC;IAClF,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC;IACV,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;CAC3D"}
+{"version":3,"file":"sql-dialect.d.ts","sourceRoot":"","sources":["../../../src/core/dialects/sql-dialect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE3E,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,mBAAmB,GAAG,aAAa,CAAC;IAC5F,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC;IACV,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;CAC3D"}

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

@@ -1 +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"}
+{"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;AAKD,wBAAgB,mBAAmB,IAAI,gBAAgB,CAoBtD"}

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

@@ -1,9 +1,9 @@
 import { createRequire } from 'module';
 let cachedModule;
+const nodeRequire = createRequire(import.meta.url);
 export function getAutoClientModule() {
     if (!cachedModule) {
         try {
-            const nodeRequire = createRequire(`${process.cwd()}/noop.js`);
             const clientModule = nodeRequire('@clickhouse/client');
             const settings = clientModule.ClickHouseSettings;
             cachedModule = {

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

@@ -1,96 +1,39 @@
 import type { BuilderState, SchemaDefinition } from '../types/builder-state.js';
 import { QueryBuilder } from '../query-builder.js';
+import type { SelectQueryNode, SelectionNode } from '../../types/index.js';
 export declare class AggregationFeature<Schema extends SchemaDefinition<Schema>, State extends BuilderState<Schema, string, any, keyof Schema, Partial<Record<string, keyof Schema>>>> {
     private builder;
+    private static readonly TRAILING_ALIAS_PATTERN;
+    private static readonly LEADING_AGGREGATE_CALL_PATTERN;
     constructor(builder: QueryBuilder<Schema, State>);
+    private stripTrailingAlias;
+    private isAggregateSelection;
+    private createAggregateSelection;
+    private shouldInferGroupByFromSelection;
+    private inferGroupBySelections;
     private createAggregation;
-    sum(column: string, alias: string): {
-        select: string[];
-        where?: import("../../types/base.js").WhereCondition[];
-        groupBy?: string[];
-        having?: string[];
+    sum(column: string, alias: string): SelectQueryNode<State["output"], Schema>;
+    count(column: string, alias: string): SelectQueryNode<State["output"], Schema>;
+    avg(column: string, alias: string): SelectQueryNode<State["output"], Schema>;
+    min(column: string, alias: string): SelectQueryNode<State["output"], Schema>;
+    max(column: string, alias: string): SelectQueryNode<State["output"], Schema>;
+    countDistinct(column: string, alias: string): {
+        select: SelectionNode[];
+        kind: "select-query";
+        from?: import("../../types/base.js").SourceNode;
+        arrayJoins?: import("../../types/base.js").ArrayJoinNode[];
+        prewhere?: import("../../types/base.js").ExprNode;
+        where?: import("../../types/base.js").ExprNode;
+        groupBy?: import("../../types/base.js").GroupByItemNode[];
+        withTotals?: boolean;
+        having?: import("../../types/base.js").HavingNode[];
+        limitBy?: import("../../types/base.js").LimitByNode;
         limit?: number;
         offset?: number;
         distinct?: boolean;
-        orderBy?: {
-            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
-            direction: import("../../index.js").OrderDirection;
-        }[] | undefined;
-        joins?: import("../../types/base.js").JoinClause[];
-        parameters?: any[];
-        ctes?: string[];
-        unionQueries?: string[];
-        settings?: import("@clickhouse/client-common").ClickHouseSettings;
-    };
-    count(column: string, alias: string): {
-        select: string[];
-        where?: import("../../types/base.js").WhereCondition[];
-        groupBy?: string[];
-        having?: string[];
-        limit?: number;
-        offset?: number;
-        distinct?: boolean;
-        orderBy?: {
-            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
-            direction: import("../../index.js").OrderDirection;
-        }[] | undefined;
-        joins?: import("../../types/base.js").JoinClause[];
-        parameters?: any[];
-        ctes?: string[];
-        unionQueries?: string[];
-        settings?: import("@clickhouse/client-common").ClickHouseSettings;
-    };
-    avg(column: string, alias: string): {
-        select: string[];
-        where?: import("../../types/base.js").WhereCondition[];
-        groupBy?: string[];
-        having?: string[];
-        limit?: number;
-        offset?: number;
-        distinct?: boolean;
-        orderBy?: {
-            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
-            direction: import("../../index.js").OrderDirection;
-        }[] | undefined;
-        joins?: import("../../types/base.js").JoinClause[];
-        parameters?: any[];
-        ctes?: string[];
-        unionQueries?: string[];
-        settings?: import("@clickhouse/client-common").ClickHouseSettings;
-    };
-    min(column: string, alias: string): {
-        select: string[];
-        where?: import("../../types/base.js").WhereCondition[];
-        groupBy?: string[];
-        having?: string[];
-        limit?: number;
-        offset?: number;
-        distinct?: boolean;
-        orderBy?: {
-            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
-            direction: import("../../index.js").OrderDirection;
-        }[] | undefined;
-        joins?: import("../../types/base.js").JoinClause[];
-        parameters?: any[];
-        ctes?: string[];
-        unionQueries?: string[];
-        settings?: import("@clickhouse/client-common").ClickHouseSettings;
-    };
-    max(column: string, alias: string): {
-        select: string[];
-        where?: import("../../types/base.js").WhereCondition[];
-        groupBy?: string[];
-        having?: string[];
-        limit?: number;
-        offset?: number;
-        distinct?: boolean;
-        orderBy?: {
-            column: keyof State["output"] | import("../../index.js").TableColumn<Schema>;
-            direction: import("../../index.js").OrderDirection;
-        }[] | undefined;
-        joins?: import("../../types/base.js").JoinClause[];
-        parameters?: any[];
-        ctes?: string[];
+        orderBy?: import("../../types/base.js").OrderByItemNode[];
+        joins?: import("../../types/base.js").JoinNode[];
+        ctes?: import("../../types/base.js").CteNode[];
         unionQueries?: string[];
         settings?: import("@clickhouse/client-common").ClickHouseSettings;
     };

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,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"}
+{"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;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE3E,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;IAKxF,OAAO,CAAC,OAAO;IAH3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAsC;IACpF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,8BAA8B,CAAoC;gBAEtE,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAExD,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,+BAA+B;IAYvC,OAAO,CAAC,sBAAsB;IAa9B,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;IAIjC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;CAiB5C"}

package/dist/core/features/aggregations.js

@@ -1,21 +1,58 @@
 export class AggregationFeature {
     builder;
+    static TRAILING_ALIAS_PATTERN = /\s+AS\s+[A-Za-z_][A-Za-z0-9_]*$/i;
+    static LEADING_AGGREGATE_CALL_PATTERN = /^(COUNT|SUM|AVG|MIN|MAX)\s*\(/i;
     constructor(builder) {
         this.builder = builder;
     }
+    stripTrailingAlias(selection) {
+        return selection.replace(AggregationFeature.TRAILING_ALIAS_PATTERN, '').trim();
+    }
+    isAggregateSelection(selection) {
+        const expressionWithoutAlias = this.stripTrailingAlias(selection);
+        return AggregationFeature.LEADING_AGGREGATE_CALL_PATTERN.test(expressionWithoutAlias);
+    }
+    createAggregateSelection(selection) {
+        return {
+            kind: 'selection',
+            selection,
+            isAggregate: true,
+        };
+    }
+    shouldInferGroupByFromSelection(item) {
+        if (item.selection === '*') {
+            return false;
+        }
+        if (item.isAggregate === true) {
+            return false;
+        }
+        return !this.isAggregateSelection(item.selection);
+    }
+    inferGroupBySelections(select) {
+        return select
+            .filter(item => this.shouldInferGroupByFromSelection(item))
+            .map(item => item.selection)
+            .map(selection => {
+            const aliasMatch = selection.match(/\s+AS\s+([A-Za-z_][A-Za-z0-9_]*)$/i);
+            return {
+                kind: 'group-by-item',
+                expression: aliasMatch ? aliasMatch[1] : selection,
+            };
+        });
+    }
     createAggregation(column, fn, alias) {
         const aggregationSQL = `${fn}(${column}) AS ${alias}`;
-        const config = this.builder.getConfig();
-        if (config.select) {
+        const query = this.builder.getQueryNode();
+        if (query.select) {
             return {
-                ...config,
-                select: [...(config.select || []).map(String), aggregationSQL],
-                groupBy: (config.select || []).map(String).filter(col => !col.includes(' AS '))
+                ...query,
+                select: [...query.select, this.createAggregateSelection(aggregationSQL)],
+                groupBy: query.groupBy || this.inferGroupBySelections(query.select)
             };
         }
         return {
-            ...config,
-            select: [aggregationSQL]
+            ...query,
+            select: [this.createAggregateSelection(aggregationSQL)]
         };
     }
     sum(column, alias) {
@@ -33,4 +70,19 @@ export class AggregationFeature {
     max(column, alias) {
         return this.createAggregation(column, 'MAX', alias);
     }
+    countDistinct(column, alias) {
+        const aggregationSQL = `COUNT(DISTINCT ${column}) AS ${alias}`;
+        const query = this.builder.getQueryNode();
+        if (query.select) {
+            return {
+                ...query,
+                select: [...query.select, this.createAggregateSelection(aggregationSQL)],
+                groupBy: query.groupBy || this.inferGroupBySelections(query.select),
+            };
+        }
+        return {
+            ...query,
+            select: [this.createAggregateSelection(aggregationSQL)],
+        };
+    }
 }