@hypequery/clickhouse 2.10.0 → 2.11.0

package/dist/core/query-builder.js

@@ -9,6 +9,7 @@ import { QueryModifiersFeature } from './features/query-modifiers.js';
 import { FilterValidator } from './validators/filter-validator.js';
 import { createPredicateBuilder, } from './utils/predicate-builder.js';
 import { CrossFilteringFeature } from './features/cross-filtering.js';
+import { CteScope } from './cte-scope.js';
 import { cloneSelectQueryNode, createSelectQueryNode, transformSelectQueryNode, } from './query-node.js';
 import { executeWithCache } from './cache/cache-manager.js';
 import { mergeCacheOptionsPartial, initializeCacheRuntime } from './cache/utils.js';
@@ -99,6 +100,9 @@ export class QueryBuilder {
         if (this.query.from?.kind === 'subquery') {
             throw new Error(`${feature} can only be applied to a table source. Apply ${innerMethod} to the inner query before passing it to db.from().`);
         }
+        if (this.query.from?.kind === 'table' && this.query.from.cte) {
+            throw new Error(`${feature} can only be applied to a table source, and "${this.query.from.name}" is a CTE.`);
+        }
     }
     withAliasesState(aliases) {
         return {
@@ -169,10 +173,33 @@ export class QueryBuilder {
         next.cacheOptions = mergeCacheOptionsPartial(next.cacheOptions, options);
         return next;
     }
-    // --- Analytics Helper: Add a CTE.
-    withCTE(alias, subquery) {
+    // Overloads expose the precise state. The implementation erases only State
+    // because QueryBuilder instances with different states are not assignable.
+    withCTE(alias, subquery, columns) {
+        return this.addCte(alias, subquery, columns, false);
+    }
+    withRecursiveCTE(alias, body, columns) {
+        return this.addCte(alias, body, columns, true);
+    }
+    addCte(alias, subquery, columns, recursive) {
         assertSafeIdentifier(alias, 'CTE alias');
-        return this.updateQuery(() => this.analytics.addCTE(alias, subquery));
+        for (const column of Object.keys(columns ?? {})) {
+            assertSafeIdentifier(column, 'CTE column');
+        }
+        const nextConfig = this.analytics.addCTE(alias, subquery, { recursive });
+        // A raw body with no declared columns exposes nothing to type against, so
+        // the alias stays unregistered rather than registering an empty shape.
+        if (!(subquery instanceof QueryBuilder) && !columns) {
+            return this.assignQuery(this.cloneMutable(), nextConfig);
+        }
+        // Columns are carried by the state's type; a builder CTE takes its shape
+        // from the subquery's output type, so the runtime value stays empty.
+        const shape = columns ?? {};
+        const nextState = {
+            ...this.state,
+            ctes: { ...this.state.ctes, [alias]: shape },
+        };
+        return this.transition(nextState, nextConfig);
     }
     // --- Analytics Helper: Add a scalar WITH alias.
     withScalar(alias, expressionBuilder) {
@@ -530,7 +557,7 @@ export class QueryBuilder {
             ? { ...this.state.aliases, [alias]: table }
             : this.state.aliases);
         const nextState = this.withAliasesState(nextAliases);
-        const nextConfig = this.joins.addJoin(type, table, String(leftColumn), rightColumn, alias, undefined, on);
+        const nextConfig = this.joins.addJoin(type, String(table), String(leftColumn), String(rightColumn), alias, undefined, on);
         return this.transition(nextState, nextConfig);
     }
     /**
@@ -571,10 +598,34 @@ export function createQueryBuilder(config) {
     const resolvedDialect = dialect ?? new ClickHouseDialect();
     const namespace = cacheConfig?.namespace || resolvedAdapter.namespace || resolvedAdapter.name;
     const { runtime, cacheController } = initializeCacheRuntime(cacheConfig, namespace);
+    const rootScope = new CteScope({
+        runtime,
+        adapter: resolvedAdapter,
+        dialect: resolvedDialect,
+    });
     return {
         cache: cacheController,
         adapter: resolvedAdapter,
         dialect: resolvedDialect,
+        /**
+         * Declares a CTE before the query has a source, so the query can read from
+         * it. Use `db.table('x').withCTE(...)` when the CTE is only joined in.
+         *
+         * @example
+         * ```ts
+         * const rows = await db
+         *   .withCTE('active_users', db.table('users').select(['id']).where('status', 'eq', 'active'))
+         *   .table('active_users')
+         *   .select(['id'])
+         *   .execute();
+         * ```
+         */
+        withCTE: rootScope.withCTE.bind(rootScope),
+        /**
+         * Declares a recursive CTE and renders the clause as `WITH RECURSIVE`.
+         * See {@link CteScope.withRecursiveCTE}.
+         */
+        withRecursiveCTE: rootScope.withRecursiveCTE.bind(rootScope),
         async rawQuery(sql, params = [], options) {
             return resolvedAdapter.query(sql, params, options);
         },
@@ -644,6 +695,7 @@ export function createQueryBuilder(config) {
                 base: {},
                 aliases: {},
                 scalars: {},
+                ctes: {},
             };
             const builder = new QueryBuilder(subquery.getTableName(), state, runtime, resolvedAdapter, resolvedDialect, {
                 kind: 'subquery',

package/dist/core/query-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-node.d.ts","sourceRoot":"","sources":["../../src/core/query-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,QAAQ,EACR,eAAe,EACf,WAAW,EACX,eAAe,EAEhB,MAAM,mBAAmB,CAAC;AA0B3B,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAgCnE;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EACpD,MAAM,GAAE,WAAW,CAAC,OAAO,EAAE,OAAO,CAAM,GACzC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAiCnC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EACnD,KAAK,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,GACvC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAEnC;AAED,wBAAgB,qBAAqB,CACnC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAM,GAClD,eAAe,CAOjB;AAoBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,eAAe,GAAG,eAAe,CAE5E;AAED,MAAM,MAAM,kBAAkB,CAAC,OAAO,EAAE,OAAO,IAAI,CACjD,KAAK,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,KACrC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAEvC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EACvD,KAAK,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,EACxC,UAAU,EAAE,aAAa,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,GAC9D,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAKnC"}
+{"version":3,"file":"query-node.d.ts","sourceRoot":"","sources":["../../src/core/query-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,QAAQ,EACR,eAAe,EACf,WAAW,EACX,eAAe,EAEhB,MAAM,mBAAmB,CAAC;AA0B3B,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAgCnE;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EACpD,MAAM,GAAE,WAAW,CAAC,OAAO,EAAE,OAAO,CAAM,GACzC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAuCnC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EACnD,KAAK,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,GACvC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAEnC;AAED,wBAAgB,qBAAqB,CACnC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAM,GAClD,eAAe,CAOjB;AAoBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,eAAe,GAAG,eAAe,CAE5E;AAED,MAAM,MAAM,kBAAkB,CAAC,OAAO,EAAE,OAAO,IAAI,CACjD,KAAK,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,KACrC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAEvC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EACvD,KAAK,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,EACxC,UAAU,EAAE,aAAa,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,GAC9D,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAKnC"}

package/dist/core/query-node.js

@@ -82,7 +82,13 @@ export function createSelectQueryNode(config = {}) {
         joins: config.joins
             ? config.joins.map(item => ({ ...item, on: cloneExprNode(item.on) }))
             : undefined,
-        ctes: config.ctes ? config.ctes.map(item => ({ ...item })) : undefined,
+        ctes: config.ctes
+            ? config.ctes.map(item => ({
+                ...item,
+                parameters: item.parameters ? [...item.parameters] : undefined,
+            }))
+            : undefined,
+        recursiveCtes: config.recursiveCtes,
         unionQueries: config.unionQueries ? [...config.unionQueries] : undefined,
         settings: config.settings ? { ...config.settings } : undefined,
     };

package/dist/core/tests/integration/setup.d.ts

@@ -3,6 +3,15 @@ export declare const initializeTestConnection: () => Promise<{
     cache: import("../../cache/controller.js").CacheController;
     adapter: import("../../adapters/database-adapter.js").DatabaseAdapter;
     dialect: import("../../dialects/sql-dialect.js").SqlDialect;
+    withCTE: {
+        <Alias extends string, SubqueryState extends import("../../types/builder-state.js").AnyBuilderState>(alias: Alias, subquery: import("../../query-builder.js").QueryBuilder<any, SubqueryState>): import("../../cte-scope.js").CteScope<import("../../types/builder-state.js").SchemaDefinition<unknown>, import("../../types/builder-state.js").RegisterCte<{}, Alias, SubqueryState["output"]>>;
+        <Alias extends string, Columns extends Record<string, import("../../../index.js").ColumnType>>(alias: Alias, sql: string | import("../../../index.js").RawCteBody, columns: Columns): import("../../cte-scope.js").CteScope<import("../../types/builder-state.js").SchemaDefinition<unknown>, import("../../types/builder-state.js").RegisterCte<{}, Alias, Columns>>;
+        (alias: string, sql: string | import("../../../index.js").RawCteBody): import("../../cte-scope.js").CteScope<import("../../types/builder-state.js").SchemaDefinition<unknown>, {}>;
+    };
+    withRecursiveCTE: {
+        <Alias extends string, Columns extends Record<string, import("../../../index.js").ColumnType>>(alias: Alias, body: string | import("../../../index.js").RawCteBody, columns: Columns): import("../../cte-scope.js").CteScope<import("../../types/builder-state.js").SchemaDefinition<unknown>, import("../../types/builder-state.js").RegisterCte<{}, Alias, Columns>>;
+        (alias: string, body: string | import("../../../index.js").RawCteBody): import("../../cte-scope.js").CteScope<import("../../types/builder-state.js").SchemaDefinition<unknown>, {}>;
+    };
     rawQuery<TResult = any>(sql: string, params?: unknown[], options?: import("../../adapters/database-adapter.js").QueryExecutionOptions): Promise<TResult[]>;
     close(): Promise<void>;
     insert<TableName extends never>(tableName: TableName): import("../../insert-builder.js").InsertQB<import("../../types/builder-state.js").SchemaDefinition<unknown>, TableName>;

package/dist/core/tests/integration/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../src/core/tests/integration/setup.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACtB,SAAS,EAQV,MAAM,kDAAkD,CAAC;AA4B1D,eAAO,MAAM,wBAAwB;;;;;;;;;EAyBpC,CAAC;AAGF,eAAO,MAAM,2BAA2B,yGAevC,CAAC;AAGF,eAAO,MAAM,kBAAkB,GAAU,eAAe,MAAM,KAAG,OAAO,CAAC,OAAO,CAE/E,CAAC;AAGF,eAAO,MAAM,wBAAwB,QAAa,OAAO,CAAC,IAAI,CAO7D,CAAC;AAGF,eAAO,MAAM,iBAAiB,GAC5B,oBAAgB,EAChB,sBAAoB,KACnB,OAAO,CAAC,IAAI,CAOd,CAAC;AAGF,eAAO,MAAM,uBAAuB,QAAa,OAAO,CAAC,IAAI,CAU5D,CAAC;AAGF,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,KAAK,CAAC;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,OAAO,CAAC;QACnB,IAAI,EAAE,MAAM,EAAE,CAAC;KAChB,CAAC,CAAC;IACH,KAAK,EAAE,KAAK,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;IACH,MAAM,EAAE,KAAK,CAAC;QACZ,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;CACJ;AAED,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,SAAS,EAAE,CAAC;AAKxE,eAAO,MAAM,iBAAiB,QAAa,OAAO,CAAC,IAAI,CAuBtD,CAAC"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../src/core/tests/integration/setup.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACtB,SAAS,EAQV,MAAM,kDAAkD,CAAC;AA4B1D,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;EAyBpC,CAAC;AAGF,eAAO,MAAM,2BAA2B,yGAevC,CAAC;AAGF,eAAO,MAAM,kBAAkB,GAAU,eAAe,MAAM,KAAG,OAAO,CAAC,OAAO,CAE/E,CAAC;AAGF,eAAO,MAAM,wBAAwB,QAAa,OAAO,CAAC,IAAI,CAO7D,CAAC;AAGF,eAAO,MAAM,iBAAiB,GAC5B,oBAAgB,EAChB,sBAAoB,KACnB,OAAO,CAAC,IAAI,CAOd,CAAC;AAGF,eAAO,MAAM,uBAAuB,QAAa,OAAO,CAAC,IAAI,CAU5D,CAAC;AAGF,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,KAAK,CAAC;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,OAAO,CAAC;QACnB,IAAI,EAAE,MAAM,EAAE,CAAC;KAChB,CAAC,CAAC;IACH,KAAK,EAAE,KAAK,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;IACH,MAAM,EAAE,KAAK,CAAC;QACZ,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;CACJ;AAED,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,SAAS,EAAE,CAAC;AAKxE,eAAO,MAAM,iBAAiB,QAAa,OAAO,CAAC,IAAI,CAuBtD,CAAC"}

package/dist/core/tests/test-utils.d.ts

@@ -1,4 +1,6 @@
-import { SelectQB } from '../query-builder.js';
+import { QueryBuilder, SelectQB } from '../query-builder.js';
+import type { DatabaseAdapter } from '../adapters/database-adapter.js';
+import type { BuilderState } from '../types/builder-state.js';
 import type { TableRecord } from '../../types/schema.js';
 export type TestTableSchema = {
     id: 'Int32';
@@ -39,6 +41,26 @@ export interface TestSchema {
     users: UsersSchema;
 }
 export declare const TEST_SCHEMAS: TestSchema;
+/** A client over the test schema, for the entry points that start from `db`. */
+export declare function setupTestClient(): {
+    cache: import("../cache/controller.js").CacheController;
+    adapter: DatabaseAdapter;
+    dialect: import("../dialects/sql-dialect.js").SqlDialect;
+    withCTE: {
+        <Alias extends string, SubqueryState extends import("../types/builder-state.js").AnyBuilderState>(alias: Alias, subquery: QueryBuilder<any, SubqueryState>): import("../cte-scope.js").CteScope<TestSchema, import("../types/builder-state.js").RegisterCte<{}, Alias, SubqueryState["output"]>>;
+        <Alias extends string, Columns extends Record<string, import("../../types/schema.js").ColumnType>>(alias: Alias, sql: string | import("../../index.js").RawCteBody, columns: Columns): import("../cte-scope.js").CteScope<TestSchema, import("../types/builder-state.js").RegisterCte<{}, Alias, Columns>>;
+        (alias: string, sql: string | import("../../index.js").RawCteBody): import("../cte-scope.js").CteScope<TestSchema, {}>;
+    };
+    withRecursiveCTE: {
+        <Alias extends string, Columns extends Record<string, import("../../types/schema.js").ColumnType>>(alias: Alias, body: string | import("../../index.js").RawCteBody, columns: Columns): import("../cte-scope.js").CteScope<TestSchema, import("../types/builder-state.js").RegisterCte<{}, Alias, Columns>>;
+        (alias: string, body: string | import("../../index.js").RawCteBody): import("../cte-scope.js").CteScope<TestSchema, {}>;
+    };
+    rawQuery<TResult = any>(sql: string, params?: unknown[], options?: import("../adapters/database-adapter.js").QueryExecutionOptions): Promise<TResult[]>;
+    close(): Promise<void>;
+    insert<TableName extends keyof TestSchema>(tableName: TableName): import("../insert-builder.js").InsertQB<TestSchema, TableName>;
+    table<TableName extends keyof TestSchema>(tableName: TableName): SelectQB<TestSchema, TableName, TableRecord<TestSchema[TableName]>, TableName>;
+    from<SubqueryState extends BuilderState<TestSchema, string, any, keyof TestSchema, any, any, any>>(subquery: QueryBuilder<TestSchema, SubqueryState>): QueryBuilder<TestSchema, import("../types/builder-state.js").FromSubqueryState<TestSchema, SubqueryState>>;
+};
 export declare function setupUsersBuilder(): SelectQB<TestSchema, 'users', TableRecord<TestSchema['users']>, 'users'>;
 export declare function setupTestBuilder(): SelectQB<TestSchema, 'test_table', TableRecord<TestSchema['test_table']>, 'test_table'>;
 //# sourceMappingURL=test-utils.d.ts.map

package/dist/core/tests/test-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../src/core/tests/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIzD,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,SAAS,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,QAAQ,CAAC;IACjB,KAAK,EAAE,QAAQ,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IAEnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,qBAAqB,CAAC;IAChC,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,EAAE,qCAAqC,CAAC;IAChD,aAAa,EAAE,kBAAkB,CAAC;IAClC,UAAU,EAAE,+BAA+B,CAAC;IAC5C,aAAa,EAAE,4CAA4C,CAAC;IAC5D,aAAa,EAAE,yBAAyB,CAAC;IACzC,WAAW,EAAE,4BAA4B,CAAC;IAC1C,iBAAiB,EAAE,eAAe,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,QAAQ,CAAC;IACpB,KAAK,EAAE,QAAQ,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EAAE,qBAAqB,CAAC;IAC/B,WAAW,EAAE,+CAA+C,CAAC;IAC7D,KAAK,EAAE,+BAA+B,CAAC;IACvC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,eAAe,CAAC;IAC5B,KAAK,EAAE,WAAW,CAAC;CACpB;AAED,eAAO,MAAM,YAAY,EAAE,UAmC1B,CAAC;AA6BF,wBAAgB,iBAAiB,IAAI,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAW5G;AAED,wBAAgB,gBAAgB,IAAI,QAAQ,CAAC,UAAU,EAAE,YAAY,EAAE,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,CAW1H"}
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../src/core/tests/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,YAAY,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIzD,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,SAAS,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,QAAQ,CAAC;IACjB,KAAK,EAAE,QAAQ,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IAEnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,qBAAqB,CAAC;IAChC,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,EAAE,qCAAqC,CAAC;IAChD,aAAa,EAAE,kBAAkB,CAAC;IAClC,UAAU,EAAE,+BAA+B,CAAC;IAC5C,aAAa,EAAE,4CAA4C,CAAC;IAC5D,aAAa,EAAE,yBAAyB,CAAC;IACzC,WAAW,EAAE,4BAA4B,CAAC;IAC1C,iBAAiB,EAAE,eAAe,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,QAAQ,CAAC;IACpB,KAAK,EAAE,QAAQ,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EAAE,qBAAqB,CAAC;IAC/B,WAAW,EAAE,+CAA+C,CAAC;IAC7D,KAAK,EAAE,+BAA+B,CAAC;IACvC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,eAAe,CAAC;IAC5B,KAAK,EAAE,WAAW,CAAC;CACpB;AAED,eAAO,MAAM,YAAY,EAAE,UAmC1B,CAAC;AA6BF,gFAAgF;AAChF,wBAAgB,eAAe;;;;;;;;;;;;;;;;;;EAK9B;AAED,wBAAgB,iBAAiB,IAAI,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAY5G;AAED,wBAAgB,gBAAgB,IAAI,QAAQ,CAAC,UAAU,EAAE,YAAY,EAAE,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,CAY1H"}

package/dist/core/tests/test-utils.js

@@ -1,4 +1,4 @@
-import { QueryBuilder } from '../query-builder.js';
+import { createQueryBuilder, QueryBuilder } from '../query-builder.js';
 import { ClickHouseDialect } from '../dialects/clickhouse-dialect.js';
 import { buildRuntimeContext, resolveCacheConfig } from '../cache/runtime-context.js';
 import { substituteParameters } from '../utils.js';
@@ -49,6 +49,13 @@ const testAdapter = {
     render: (sql, params = []) => substituteParameters(sql, params)
 };
 const testDialect = new ClickHouseDialect();
+/** A client over the test schema, for the entry points that start from `db`. */
+export function setupTestClient() {
+    return createQueryBuilder({
+        adapter: testAdapter,
+        dialect: testDialect,
+    });
+}
 export function setupUsersBuilder() {
     const state = {
         schema: TEST_SCHEMAS,
@@ -57,7 +64,8 @@ export function setupUsersBuilder() {
         baseTable: 'users',
         base: TEST_SCHEMAS.users,
         aliases: {},
-        scalars: {}
+        scalars: {},
+        ctes: {}
     };
     return new QueryBuilder('users', state, createTestRuntime(), testAdapter, testDialect);
 }
@@ -69,7 +77,8 @@ export function setupTestBuilder() {
         baseTable: 'test_table',
         base: TEST_SCHEMAS.test_table,
         aliases: {},
-        scalars: {}
+        scalars: {},
+        ctes: {}
     };
     return new QueryBuilder('test_table', state, createTestRuntime(), testAdapter, testDialect);
 }

package/dist/core/types/builder-state.d.ts

@@ -5,7 +5,22 @@ export type SchemaDefinition<Schema extends Record<string, any> = Record<string,
     [K in keyof Schema]: Record<string, ColumnType>;
 };
 export declare const SUBQUERY_SOURCE_TABLE: "__hypequery_internal_subquery_source__";
-export type BuilderState<Schema extends SchemaDefinition<Schema>, VisibleTables extends string, OutputRow, BaseTable extends keyof Schema, Aliases extends Partial<Record<string, keyof Schema>> = {}, Scalars extends Record<string, unknown> = {}, BaseShape extends Record<string, unknown> = Schema[BaseTable]> = {
+export declare const CTE_SOURCE_TABLE: "__hypequery_internal_cte_source__";
+/**
+ * Markers for sources that are not schema tables. They resolve to no columns,
+ * so they only ever gate the modifiers that need a real table.
+ */
+export type NonTableSource = typeof SUBQUERY_SOURCE_TABLE | typeof CTE_SOURCE_TABLE;
+/**
+ * The columns a source exposes. Either schema-style `ColumnType` strings
+ * (`{ id: 'UUID' }`) or an already-resolved row type (`{ id: string }`), which
+ * is what a CTE built from another builder carries.
+ */
+export type ColumnShape = Record<string, unknown>;
+export type CteShapes = Record<string, ColumnShape>;
+/** A broad string alias must not shadow every schema table. */
+export type RegisterCte<Ctes extends CteShapes, Alias extends string, Columns extends ColumnShape> = string extends Alias ? Ctes : Ctes & Record<Alias, Columns>;
+export type BuilderState<Schema extends SchemaDefinition<Schema>, VisibleTables extends string, OutputRow, BaseTable extends keyof Schema, Aliases extends Partial<Record<string, keyof Schema>> = {}, Scalars extends Record<string, unknown> = {}, BaseShape extends Record<string, unknown> = Schema[BaseTable], Ctes extends CteShapes = {}> = {
     schema: Schema;
     tables: VisibleTables;
     output: OutputRow;
@@ -13,18 +28,58 @@ export type BuilderState<Schema extends SchemaDefinition<Schema>, VisibleTables
     base: BaseShape;
     aliases: Aliases;
     scalars: Scalars;
+    /**
+     * CTE aliases declared on this query, with the columns each exposes.
+     * Optional so hand-constructed states stay valid.
+     */
+    ctes?: Ctes;
 };
-export type AnyBuilderState = BuilderState<any, any, any, any, any, any, any>;
-export type BaseRow<State extends AnyBuilderState> = Simplify<{
-    [K in keyof State['base']]: State['base'][K] extends ColumnType ? InferColumnType<State['base'][K]> : State['base'][K];
+export type AnyBuilderState = BuilderState<any, any, any, any, any, any, any, any>;
+/**
+ * Resolves a column shape to the row type it produces. `ColumnType` strings are
+ * inferred; anything else is already a TypeScript type and passes through.
+ */
+export type RowFromShape<Shape> = Simplify<{
+    [K in keyof Shape]: Shape[K] extends ColumnType ? InferColumnType<Shape[K]> : Shape[K];
 }>;
-export type WidenTables<State extends AnyBuilderState, Table extends keyof State['schema']> = BuilderState<State['schema'], State['tables'] | (Table & string), State['output'], State['baseTable'], State['aliases'], State['scalars'], State['base']>;
-export type UpdateOutput<State extends AnyBuilderState, Output> = BuilderState<State['schema'], State['tables'], Output, State['baseTable'], State['aliases'], State['scalars'], State['base']>;
+export type BaseRow<State extends AnyBuilderState> = RowFromShape<State['base']>;
+/** The CTE map, with the optionality of the state field resolved away. */
+export type StateCtes<State extends AnyBuilderState> = NonNullable<State['ctes']>;
+export type CteNames<State extends AnyBuilderState> = Extract<keyof StateCtes<State>, string>;
+/** Tables a join may target: schema tables plus CTEs declared on this query. */
+export type JoinableTable<State extends AnyBuilderState> = Extract<keyof State['schema'], string> | CteNames<State>;
+export type WidenTables<State extends AnyBuilderState, Table extends keyof State['schema'] | CteNames<State>> = BuilderState<State['schema'], State['tables'] | (Table & string), State['output'], State['baseTable'], State['aliases'], State['scalars'], State['base'], StateCtes<State>>;
+export type UpdateOutput<State extends AnyBuilderState, Output> = BuilderState<State['schema'], State['tables'], Output, State['baseTable'], State['aliases'], State['scalars'], State['base'], StateCtes<State>>;
 export type InitialState<Schema extends SchemaDefinition<Schema>, Table extends keyof Schema> = BuilderState<Schema, Table & string, TableRecord<Schema[Table]>, Table, {}, {}>;
 export type ExplicitSelectionState<State extends AnyBuilderState> = BaseRow<State> extends State['output'] ? State['output'] extends BaseRow<State> ? false : true : true;
 export type AppendToOutput<State extends AnyBuilderState, Added> = UpdateOutput<State, ExplicitSelectionState<State> extends true ? Simplify<State['output'] & Added> : Simplify<Added>>;
-export type AddAlias<State extends AnyBuilderState, Alias extends string, Table extends keyof State['schema']> = BuilderState<State['schema'], State['tables'] | Alias, State['output'], State['baseTable'], State['aliases'] & Record<Alias, Table>, State['scalars'], State['base']>;
-export type AddScalar<State extends AnyBuilderState, Alias extends string, Value> = BuilderState<State['schema'], State['tables'], State['output'], State['baseTable'], State['aliases'], State['scalars'] & Record<Alias, Value>, State['base']>;
+export type AddAlias<State extends AnyBuilderState, Alias extends string, Table extends keyof State['schema']> = BuilderState<State['schema'], State['tables'] | Alias, State['output'], State['baseTable'], State['aliases'] & Record<Alias, Table>, State['scalars'], State['base'], StateCtes<State>>;
+export type AddScalar<State extends AnyBuilderState, Alias extends string, Value> = BuilderState<State['schema'], State['tables'], State['output'], State['baseTable'], State['aliases'], State['scalars'] & Record<Alias, Value>, State['base'], StateCtes<State>>;
+/** Columns accepted for a join's right-hand side, qualified by table or CTE. */
+export type JoinRightColumn<State extends AnyBuilderState, Table extends JoinableTable<State>> = `${Table}.${Extract<keyof ResolveTableSchema<State, Table>, string>}`;
+/**
+ * Joining a CTE cannot take a table alias: aliases resolve through the schema,
+ * and a CTE has no schema entry to resolve to.
+ */
+export type JoinAliasArg<State extends AnyBuilderState, Table extends JoinableTable<State>, Alias> = Table extends CteNames<State> ? undefined : Alias;
+export type JoinResultState<State extends AnyBuilderState, Table extends JoinableTable<State>, Alias> = Alias extends string ? AddAlias<WidenTables<State, Table>, Alias, Extract<Table, keyof State['schema']>> : WidenTables<State, Table>;
+/**
+ * Registers a CTE alias and the columns it exposes. The alias only becomes
+ * selectable once the query joins it, which mirrors SQL scoping. A broad
+ * string alias remains untyped; registering it would shadow every schema table.
+ */
+export type AddCte<State extends AnyBuilderState, Alias extends string, Columns extends ColumnShape> = BuilderState<State['schema'], State['tables'], State['output'], State['baseTable'], State['aliases'], State['scalars'], State['base'], RegisterCte<StateCtes<State>, Alias, Columns>>;
+/**
+ * Declares CTEs on a state that is otherwise unchanged — used when a query is
+ * started from a scope that already carries them.
+ */
+export type WithCtes<State extends AnyBuilderState, Ctes extends CteShapes> = BuilderState<State['schema'], State['tables'], State['output'], State['baseTable'], State['aliases'], State['scalars'], State['base'], StateCtes<State> & Ctes>;
+/**
+ * The state of a query whose source is a declared CTE rather than a schema
+ * table. The CTE's declared columns stand in for a schema entry, so selects,
+ * filters, and the result row are typed from them.
+ */
+export type CteSourceState<Schema extends SchemaDefinition<Schema>, Alias extends string, Ctes extends CteShapes> = Alias extends keyof Ctes ? BuilderState<Schema, Alias | typeof CTE_SOURCE_TABLE, RowFromShape<Ctes[Alias]>, keyof Schema, {}, {}, Ctes[Alias], Ctes> : never;
 export type FromSubqueryState<Schema extends SchemaDefinition<Schema>, SubqueryState extends BuilderState<Schema, string, any, keyof Schema, any, any, any>> = BuilderState<Schema, typeof SUBQUERY_SOURCE_TABLE, SubqueryState['output'], SubqueryState['baseTable'], {}, {}, SubqueryState['output']>;
 export type InsertState<Schema extends SchemaDefinition<Schema>, Table extends keyof Schema, Row> = {
     schema: Schema;
@@ -34,5 +89,9 @@ export type InsertState<Schema extends SchemaDefinition<Schema>, Table extends k
 export type AnyInsertState = InsertState<any, any, any>;
 export type InitialInsertState<Schema extends SchemaDefinition<Schema>, Table extends keyof Schema> = InsertState<Schema, Table, InsertRow<Schema[Table]>>;
 export type UpdateInsertRow<State extends AnyInsertState, Row> = InsertState<State['schema'], State['table'], Row>;
-export type ResolveTableSchema<State extends AnyBuilderState, Table extends string> = Table extends keyof State['schema'] ? State['schema'][Table] : Table extends keyof State['aliases'] ? State['schema'][State['aliases'][Table]] : never;
+/**
+ * Resolves an identifier used in a query to the columns it exposes. CTEs are
+ * checked first because a CTE shadows a table of the same name in SQL.
+ */
+export type ResolveTableSchema<State extends AnyBuilderState, Table extends string> = Table extends keyof StateCtes<State> ? StateCtes<State>[Table] : Table extends keyof State['schema'] ? State['schema'][Table] : Table extends keyof State['aliases'] ? State['schema'][State['aliases'][Table]] : never;
 //# sourceMappingURL=builder-state.d.ts.map

package/dist/core/types/builder-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder-state.d.ts","sourceRoot":"","sources":["../../../src/core/types/builder-state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builder-state.d.ts","sourceRoot":"","sources":["../../../src/core/types/builder-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,MAAM,gBAAgB,CAAC,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;KACtF,CAAC,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;CAChD,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAG,wCAAiD,CAAC;AACvF,eAAO,MAAM,gBAAgB,EAAG,mCAA4C,CAAC;AAE7E;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,qBAAqB,GAAG,OAAO,gBAAgB,CAAC;AAEpF;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAElD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,+DAA+D;AAC/D,MAAM,MAAM,WAAW,CAAC,IAAI,SAAS,SAAS,EAAE,KAAK,SAAS,MAAM,EAAE,OAAO,SAAS,WAAW,IAC/F,MAAM,SAAS,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAE9D,MAAM,MAAM,YAAY,CACtB,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,aAAa,SAAS,MAAM,EAC5B,SAAS,EACT,SAAS,SAAS,MAAM,MAAM,EAC9B,OAAO,SAAS,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,CAAC,GAAG,EAAE,EAC1D,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,EAC5C,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,EAC7D,IAAI,SAAS,SAAS,GAAG,EAAE,IACzB;IACF,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAEnF;;;GAGG;AACH,MAAM,MAAM,YAAY,CAAC,KAAK,IAAI,QAAQ,CAAC;KACxC,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,UAAU,GAC7C,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GACzB,KAAK,CAAC,CAAC,CAAC;CACX,CAAC,CAAC;AAEH,MAAM,MAAM,OAAO,CAAC,KAAK,SAAS,eAAe,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;AAEjF,0EAA0E;AAC1E,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,eAAe,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;AAElF,MAAM,MAAM,QAAQ,CAAC,KAAK,SAAS,eAAe,IAAI,OAAO,CAAC,MAAM,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;AAE9F,gFAAgF;AAChF,MAAM,MAAM,aAAa,CAAC,KAAK,SAAS,eAAe,IACnD,OAAO,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,GACtC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAEpB,MAAM,MAAM,WAAW,CACrB,KAAK,SAAS,eAAe,EAC7B,KAAK,SAAS,MAAM,KAAK,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,IACnD,YAAY,CACd,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,EAClC,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,WAAW,CAAC,EAClB,KAAK,CAAC,SAAS,CAAC,EAChB,KAAK,CAAC,SAAS,CAAC,EAChB,KAAK,CAAC,MAAM,CAAC,EACb,SAAS,CAAC,KAAK,CAAC,CACjB,CAAC;AAEF,MAAM,MAAM,YAAY,CACtB,KAAK,SAAS,eAAe,EAC7B,MAAM,IACJ,YAAY,CACd,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,QAAQ,CAAC,EACf,MAAM,EACN,KAAK,CAAC,WAAW,CAAC,EAClB,KAAK,CAAC,SAAS,CAAC,EAChB,KAAK,CAAC,SAAS,CAAC,EAChB,KAAK,CAAC,MAAM,CAAC,EACb,SAAS,CAAC,KAAK,CAAC,CACjB,CAAC;AAEF,MAAM,MAAM,YAAY,CACtB,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,MAAM,MAAM,IACxB,YAAY,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAEpF,MAAM,MAAM,sBAAsB,CAAC,KAAK,SAAS,eAAe,IAC9D,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,CAAC,QAAQ,CAAC,GACpC,KAAK,CAAC,QAAQ,CAAC,SAAS,OAAO,CAAC,KAAK,CAAC,GACtC,KAAK,GACL,IAAI,GACJ,IAAI,CAAC;AAET,MAAM,MAAM,cAAc,CACxB,KAAK,SAAS,eAAe,EAC7B,KAAK,IACH,YAAY,CACd,KAAK,EACL,sBAAsB,CAAC,KAAK,CAAC,SAAS,IAAI,GACxC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,GACjC,QAAQ,CAAC,KAAK,CAAC,CAClB,CAAC;AAEF,MAAM,MAAM,QAAQ,CAClB,KAAK,SAAS,eAAe,EAC7B,KAAK,SAAS,MAAM,EACpB,KAAK,SAAS,MAAM,KAAK,CAAC,QAAQ,CAAC,IACjC,YAAY,CACd,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,QAAQ,CAAC,GAAG,KAAK,EACvB,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,WAAW,CAAC,EAClB,KAAK,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EACvC,KAAK,CAAC,SAAS,CAAC,EAChB,KAAK,CAAC,MAAM,CAAC,EACb,SAAS,CAAC,KAAK,CAAC,CACjB,CAAC;AAEF,MAAM,MAAM,SAAS,CACnB,KAAK,SAAS,eAAe,EAC7B,KAAK,SAAS,MAAM,EACpB,KAAK,IACH,YAAY,CACd,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,WAAW,CAAC,EAClB,KAAK,CAAC,SAAS,CAAC,EAChB,KAAK,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EACvC,KAAK,CAAC,MAAM,CAAC,EACb,SAAS,CAAC,KAAK,CAAC,CACjB,CAAC;AAEF,gFAAgF;AAChF,MAAM,MAAM,eAAe,CACzB,KAAK,SAAS,eAAe,EAC7B,KAAK,SAAS,aAAa,CAAC,KAAK,CAAC,IAChC,GAAG,KAAK,IAAI,OAAO,CAAC,MAAM,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC;AAE1E;;;GAGG;AACH,MAAM,MAAM,YAAY,CACtB,KAAK,SAAS,eAAe,EAC7B,KAAK,SAAS,aAAa,CAAC,KAAK,CAAC,EAClC,KAAK,IACH,KAAK,SAAS,QAAQ,CAAC,KAAK,CAAC,GAAG,SAAS,GAAG,KAAK,CAAC;AAEtD,MAAM,MAAM,eAAe,CACzB,KAAK,SAAS,eAAe,EAC7B,KAAK,SAAS,aAAa,CAAC,KAAK,CAAC,EAClC,KAAK,IACH,KAAK,SAAS,MAAM,GACpB,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,GACjF,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAE9B;;;;GAIG;AACH,MAAM,MAAM,MAAM,CAChB,KAAK,SAAS,eAAe,EAC7B,KAAK,SAAS,MAAM,EACpB,OAAO,SAAS,WAAW,IACzB,YAAY,CACd,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,WAAW,CAAC,EAClB,KAAK,CAAC,SAAS,CAAC,EAChB,KAAK,CAAC,SAAS,CAAC,EAChB,KAAK,CAAC,MAAM,CAAC,EACb,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAC9C,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,QAAQ,CAClB,KAAK,SAAS,eAAe,EAC7B,IAAI,SAAS,SAAS,IACpB,YAAY,CACd,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,WAAW,CAAC,EAClB,KAAK,CAAC,SAAS,CAAC,EAChB,KAAK,CAAC,SAAS,CAAC,EAChB,KAAK,CAAC,MAAM,CAAC,EACb,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,CACxB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,cAAc,CACxB,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,MAAM,EACpB,IAAI,SAAS,SAAS,IACpB,KAAK,SAAS,MAAM,IAAI,GACxB,YAAY,CACZ,MAAM,EACN,KAAK,GAAG,OAAO,gBAAgB,EAC/B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EACzB,MAAM,MAAM,EACZ,EAAE,EACF,EAAE,EACF,IAAI,CAAC,KAAK,CAAC,EACX,IAAI,CACL,GACC,KAAK,CAAC;AAEV,MAAM,MAAM,iBAAiB,CAC3B,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,aAAa,SAAS,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAClF,YAAY,CACd,MAAM,EACN,OAAO,qBAAqB,EAC5B,aAAa,CAAC,QAAQ,CAAC,EACvB,aAAa,CAAC,WAAW,CAAC,EAC1B,EAAE,EACF,EAAE,EACF,aAAa,CAAC,QAAQ,CAAC,CACxB,CAAC;AAEF,MAAM,MAAM,WAAW,CACrB,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,MAAM,MAAM,EAC1B,GAAG,IACD;IACF,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAExD,MAAM,MAAM,kBAAkB,CAC5B,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,MAAM,MAAM,IACxB,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEzD,MAAM,MAAM,eAAe,CACzB,KAAK,SAAS,cAAc,EAC5B,GAAG,IACD,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;AAEtD;;;GAGG;AACH,MAAM,MAAM,kBAAkB,CAC5B,KAAK,SAAS,eAAe,EAC7B,KAAK,SAAS,MAAM,IAClB,KAAK,SAAS,MAAM,SAAS,CAAC,KAAK,CAAC,GACpC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GACvB,KAAK,SAAS,MAAM,KAAK,CAAC,QAAQ,CAAC,GACnC,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GACtB,KAAK,SAAS,MAAM,KAAK,CAAC,SAAS,CAAC,GACpC,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,GACxC,KAAK,CAAC"}

package/dist/core/types/builder-state.js

@@ -1 +1,2 @@
 export const SUBQUERY_SOURCE_TABLE = '__hypequery_internal_subquery_source__';
+export const CTE_SOURCE_TABLE = '__hypequery_internal_cte_source__';

package/dist/core/types/select-types.d.ts

@@ -3,7 +3,9 @@ import type { ColumnType, InferColumnType } from '../../types/schema.js';
 import type { AnyBuilderState, BaseRow, ResolveTableSchema } from './builder-state.js';
 import { Simplify, UnionToIntersection } from './type-helpers.js';
 type TableIdentifiers<State extends AnyBuilderState> = State['tables'] & string;
-type QualifiedColumnsFor<State extends AnyBuilderState, Table extends string> = ResolveTableSchema<State, Table> extends Record<string, ColumnType> ? `${Table}.${Extract<keyof ResolveTableSchema<State, Table>, string>}` : never;
+type QualifiedColumnsFor<State extends AnyBuilderState, Table extends string> = [
+    ResolveTableSchema<State, Table>
+] extends [never] ? never : `${Table}.${Extract<keyof ResolveTableSchema<State, Table>, string>}`;
 export type QualifiedColumnKeys<State extends AnyBuilderState> = {
     [Table in TableIdentifiers<State>]: QualifiedColumnsFor<State, Table>;
 }[TableIdentifiers<State>];
@@ -16,7 +18,7 @@ type AsKeyword = 'as' | 'AS' | 'As' | 'aS';
 type AliasedColumnString<State extends AnyBuilderState> = `${StringSelectableColumn<State>} ${AsKeyword} ${string}`;
 export type SelectableItem<State extends AnyBuilderState> = SelectableColumn<State> | AliasedColumnString<State> | AliasedExpression<any, string> | SqlExpression<any>;
 export type ColumnSelectionKey<P> = P extends `${string}.${infer C}` ? C : P;
-type QualifiedColumnValue<State extends AnyBuilderState, P> = P extends `${infer Table}.${infer Column}` ? ResolveTableSchema<State, Table> extends Record<string, ColumnType> ? Column extends keyof ResolveTableSchema<State, Table> ? ResolveTableSchema<State, Table>[Column] extends ColumnType ? InferColumnType<ResolveTableSchema<State, Table>[Column]> : never : never : never : never;
+type QualifiedColumnValue<State extends AnyBuilderState, P> = P extends `${infer Table}.${infer Column}` ? [ResolveTableSchema<State, Table>] extends [never] ? never : Column extends keyof ResolveTableSchema<State, Table> ? ResolveTableSchema<State, Table>[Column] extends ColumnType ? InferColumnType<ResolveTableSchema<State, Table>[Column]> : ResolveTableSchema<State, Table>[Column] : never : never;
 export type ColumnSelectionValue<State extends AnyBuilderState, P> = P extends OutputColumnKeys<State> ? State['output'][P] : P extends ScalarColumnKeys<State> ? State['scalars'][P] : P extends BaseColumnKeys<State> ? BaseRow<State>[P] : QualifiedColumnValue<State, P>;
 export type ArraySelectableColumn<State extends AnyBuilderState> = {
     [P in SelectableColumn<State>]: ColumnSelectionValue<State, P> extends readonly unknown[] | null ? P : never;

package/dist/core/types/select-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select-types.d.ts","sourceRoot":"","sources":["../../../src/core/types/select-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"select-types.d.ts","sourceRoot":"","sources":["../../../src/core/types/select-types.ts"],"names":[],"mappings":"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"}

package/dist/core/utils/compound-parameter.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Keep compound values bound as strings for CAST. The adapter escapes the
+ * resulting text again; tuple and map delimiters come only from the type.
+ */
+export declare function serializeCompoundParameter(value: unknown, type: string): unknown;
+//# sourceMappingURL=compound-parameter.d.ts.map

package/dist/core/utils/compound-parameter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compound-parameter.d.ts","sourceRoot":"","sources":["../../../src/core/utils/compound-parameter.ts"],"names":[],"mappings":"AAkDA;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAQhF"}

package/dist/core/utils/compound-parameter.js

@@ -0,0 +1,70 @@
+import { escapeValue } from '../utils.js';
+import { parseParameterType, parseTupleField } from './parameter-type.js';
+import { isPlainRecord } from './record-guards.js';
+function invalidValue(type) {
+    throw new Error(`Cannot serialize parameter value as ${type}. Use a matching JavaScript value or pass ClickHouse text for the whole parameter.`);
+}
+/** Serialize one value in ClickHouse text format, following its declared type. */
+function serializeValue(value, type) {
+    const { name, args } = parseParameterType(type);
+    if ((name === 'Nullable' || name === 'LowCardinality') && args.length === 1) {
+        if (name === 'Nullable' && value === null)
+            return 'NULL';
+        return serializeValue(value, args[0]);
+    }
+    if (value === null || value === undefined)
+        return invalidValue(type);
+    // JSON is read as a quoted string inside compound text, unlike the tuple
+    // and map syntax around it. Reuse the existing JSON escaping path.
+    if (name === 'JSON')
+        return escapeValue(value);
+    if (name === 'Array' && args.length === 1) {
+        if (!Array.isArray(value))
+            return invalidValue(type);
+        return `[${Array.from(value, item => serializeValue(item, args[0])).join(',')}]`;
+    }
+    if (name === 'Tuple') {
+        const fields = args.map(parseTupleField);
+        let items;
+        if (Array.isArray(value) && value.length === fields.length) {
+            items = value;
+        }
+        else if (isPlainRecord(value) && fields.every(field => field.name !== undefined && Object.hasOwn(value, field.name))) {
+            items = fields.map(field => value[field.name]);
+        }
+        else {
+            return invalidValue(type);
+        }
+        return `(${fields.map((field, i) => serializeValue(items[i], field.type)).join(',')})`;
+    }
+    if (name === 'Map' && args.length === 2) {
+        const entries = value instanceof Map ? [...value.entries()] : isPlainRecord(value) ? Object.entries(value) : undefined;
+        if (!entries)
+            return invalidValue(type);
+        return `{${entries.map(([key, item]) => `${serializeValue(key, args[0])}:${serializeValue(item, args[1])}`).join(',')}}`;
+    }
+    if (typeof value === 'object' && !(value instanceof Date))
+        return invalidValue(type);
+    // UInt64 values and object-map keys may be strings; text readers for numeric
+    // types expect unquoted numbers. Validate before including them in the text.
+    if (typeof value === 'string' && /^(?:U?Int\d+|Float\d+|Decimal\d*)$/.test(name)) {
+        if (!/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/.test(value))
+            return invalidValue(type);
+        return value;
+    }
+    return escapeValue(value);
+}
+/**
+ * Keep compound values bound as strings for CAST. The adapter escapes the
+ * resulting text again; tuple and map delimiters come only from the type.
+ */
+export function serializeCompoundParameter(value, type) {
+    if (Array.isArray(value) || value instanceof Map || isPlainRecord(value)) {
+        // A top-level JSON value is already handled by the adapter's normal
+        // JSON.stringify + SQL escaping path. Quoting it here would double-wrap it.
+        if (parseParameterType(type).name === 'JSON')
+            return value;
+        return serializeValue(value, type);
+    }
+    return value;
+}

package/dist/core/utils/cte-fragments.d.ts

@@ -0,0 +1,17 @@
+import type { DatabaseAdapter } from '../adapters/database-adapter.js';
+import type { CteNode } from '../../types/index.js';
+/**
+ * Renders a CTE body to a standalone string with its values inlined, following
+ * the same path `toSQL()` uses so adapter-specific rendering is preserved.
+ */
+export declare function renderCteBody(body: string, parameters: readonly unknown[], adapter: DatabaseAdapter): string;
+/**
+ * The compilable form of a CTE entry. Structured entries keep their parameters
+ * bound; entries that predate the structured fields fall back to the rendered
+ * `expression`, which has its values already inlined.
+ */
+export declare function cteFragment(node: CteNode): {
+    sql: string;
+    parameters: readonly unknown[];
+};
+//# sourceMappingURL=cte-fragments.d.ts.map

package/dist/core/utils/cte-fragments.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cte-fragments.d.ts","sourceRoot":"","sources":["../../../src/core/utils/cte-fragments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAGpD;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,SAAS,OAAO,EAAE,EAC9B,OAAO,EAAE,eAAe,GACvB,MAAM,CAIR;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,SAAS,OAAO,EAAE,CAAA;CAAE,CAI1F"}

package/dist/core/utils/cte-fragments.js

@@ -0,0 +1,20 @@
+import { substituteParameters } from '../utils.js';
+/**
+ * Renders a CTE body to a standalone string with its values inlined, following
+ * the same path `toSQL()` uses so adapter-specific rendering is preserved.
+ */
+export function renderCteBody(body, parameters, adapter) {
+    return adapter.render
+        ? adapter.render(body, [...parameters])
+        : substituteParameters(body, parameters);
+}
+/**
+ * The compilable form of a CTE entry. Structured entries keep their parameters
+ * bound; entries that predate the structured fields fall back to the rendered
+ * `expression`, which has its values already inlined.
+ */
+export function cteFragment(node) {
+    return node.name !== undefined && node.body !== undefined
+        ? { sql: `${node.name} AS (${node.body})`, parameters: node.parameters ?? [] }
+        : { sql: node.expression, parameters: [] };
+}

package/dist/core/utils/cte-scope-state.d.ts

@@ -0,0 +1,5 @@
+import type { BuilderState, CteShapes, SchemaDefinition } from '../types/builder-state.js';
+/** Concrete runtime metadata; result columns are carried by the public overloads. */
+export type CteScopeRuntimeState<Schema extends SchemaDefinition<Schema>> = BuilderState<Schema, string, Record<string, unknown>, keyof Schema, {}, {}, Record<string, unknown>, CteShapes>;
+export declare function createCteScopeState<Schema extends SchemaDefinition<Schema>>(name: string): CteScopeRuntimeState<Schema>;
+//# sourceMappingURL=cte-scope-state.d.ts.map

package/dist/core/utils/cte-scope-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cte-scope-state.d.ts","sourceRoot":"","sources":["../../../src/core/utils/cte-scope-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE3F,qFAAqF;AACrF,MAAM,MAAM,oBAAoB,CAAC,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,IAAI,YAAY,CACtF,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,CAClG,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACzE,IAAI,EAAE,MAAM,GACX,oBAAoB,CAAC,MAAM,CAAC,CAe9B"}

package/dist/core/utils/cte-scope-state.js

@@ -0,0 +1,16 @@
+export function createCteScopeState(name) {
+    return {
+        // Schema definitions are type-only in createQueryBuilder, so no runtime
+        // schema is available here either.
+        schema: {},
+        tables: name,
+        // BuilderState currently constrains baseTable to schema keys, even though
+        // CTE names also serve as base sources. Keep that boundary explicit here.
+        baseTable: name,
+        base: {},
+        output: {},
+        aliases: {},
+        scalars: {},
+        ctes: {},
+    };
+}

package/dist/core/utils/named-parameters.d.ts

@@ -0,0 +1,30 @@
+export interface NamedParameterBinding {
+    /**
+     * The SQL with every named placeholder rewritten to a positional `?`, kept
+     * inside a `CAST` to the type the placeholder declared.
+     */
+    sql: string;
+    /** The values behind those placeholders, in the order they appear. */
+    parameters: unknown[];
+}
+/**
+ * Rewrites ClickHouse-style `{name:Type}` placeholders to the positional `?`
+ * markers the builder binds against, pairing each with its value.
+ *
+ * TODO: Remove this client-side rewrite and its CAST/compound serialization
+ * once native server-side query_params binding replaces positional parameters.
+ * The public {name:Type} placeholder API can stay unchanged.
+ *
+ * Each marker is wrapped in a `CAST` to the declared type, which is what the
+ * server's own `{name:Type}` substitution does. Without it the value arrives as
+ * a String and any expression that depends on the real type fails to compile.
+ *
+ * Placeholders inside string literals, quoted identifiers, heredocs, and
+ * comments are data and are left alone, so a body can talk about braces without
+ * having them bound.
+ *
+ * Values that no placeholder references are ignored: a caller may pass one
+ * context object to several fragments.
+ */
+export declare function bindNamedParameters(sql: string, values?: Record<string, unknown>, context?: string): NamedParameterBinding;
+//# sourceMappingURL=named-parameters.d.ts.map