@hypequery/clickhouse 2.7.0 → 2.8.1

package/dist/core/adapters/clickhouse-adapter.d.ts

@@ -1,16 +1,24 @@
 import type { DatabaseAdapter, QueryExecutionOptions, InsertExecutionOptions, InsertResultSummary } from './database-adapter.js';
-import type { ClickHouseConfig } from '../query-builder.js';
+import type { ClickHouseAdapterConfig } from '../query-builder.js';
 export declare class ClickHouseAdapter implements DatabaseAdapter {
-    private config;
     readonly name = "clickhouse";
     readonly namespace?: string;
     private client;
-    constructor(config: ClickHouseConfig);
+    /** Connection-level settings, so they can outrank the adapter's own defaults. */
+    private readonly configSettings?;
+    private readonly integerJsonEncoding;
+    constructor(config: ClickHouseAdapterConfig);
+    /**
+     * Converts only rejections of the adapter-owned precision setting into an
+     * actionable configuration error. Caller-owned settings and unrelated
+     * readonly failures retain their original error identity.
+     */
+    private withReadonlyGuidance;
     query<T>(sql: string, params?: unknown[], options?: QueryExecutionOptions): Promise<T[]>;
     stream<T>(sql: string, params?: unknown[], options?: QueryExecutionOptions): Promise<ReadableStream<T[]>>;
     insert<T extends Record<string, unknown>>(table: string, rows: T[], options?: InsertExecutionOptions): Promise<InsertResultSummary>;
     close(): Promise<void>;
     render(sql: string, params?: unknown[]): string;
 }
-export declare function createClickHouseAdapter(config: ClickHouseConfig): DatabaseAdapter;
+export declare function createClickHouseAdapter(config: ClickHouseAdapterConfig): DatabaseAdapter;
 //# sourceMappingURL=clickhouse-adapter.d.ts.map

package/dist/core/adapters/clickhouse-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse-adapter.d.ts","sourceRoot":"","sources":["../../../src/core/adapters/clickhouse-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAsC5D,qBAAa,iBAAkB,YAAW,eAAe;IAK3C,OAAO,CAAC,MAAM;IAJ1B,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,MAAM,CAAmB;gBAEb,MAAM,EAAE,gBAAgB;IAKtC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAW5F,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAY7G,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5C,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,CAAC,EAAE,EACT,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,mBAAmB,CAAC;IAuBzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,GAAG,MAAM;CAGpD;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,GAAG,eAAe,CAEjF"}
+{"version":3,"file":"clickhouse-adapter.d.ts","sourceRoot":"","sources":["../../../src/core/adapters/clickhouse-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,qBAAqB,CAAC;AA2B7B,qBAAa,iBAAkB,YAAW,eAAe;IACvD,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,MAAM,CAAmB;IACjC,iFAAiF;IACjF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAqB;IACrD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;gBAE9C,MAAM,EAAE,uBAAuB;IAO3C;;;;OAIG;YACW,oBAAoB;IAqB5B,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAwB5F,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAkB7G,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5C,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,CAAC,EAAE,EACT,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,mBAAmB,CAAC;IAyBzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,GAAG,MAAM;CAGpD;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,uBAAuB,GAAG,eAAe,CAExF"}

package/dist/core/adapters/clickhouse-adapter.js

@@ -1,64 +1,68 @@
-import { isClientConfig } from '../query-builder.js';
 import { substituteParameters } from '../utils.js';
-import { getConnectionEndpoint } from '../utils/connection-endpoint.js';
 import { createJsonEachRowStream } from '../utils/streaming-helpers.js';
-import { getAutoClientModule } from '../env/auto-client.js';
 import { assertSafeInsertIdentifiers } from '../utils/insert-identifiers.js';
-function createClickHouseClient(config) {
-    if (isClientConfig(config)) {
-        return config.client;
-    }
-    const clientModule = getAutoClientModule();
-    return clientModule.createClient(config);
-}
-function deriveNamespace(config) {
-    if ('client' in config && config.client) {
-        return 'client';
-    }
-    const endpoint = getConnectionEndpoint(config);
-    const database = 'database' in config ? config.database : 'default';
-    const username = 'username' in config ? config.username : 'default';
-    return `${endpoint || 'unknown-host'}|${database || 'default'}|${username || 'default'}`;
-}
-function jsonOutputSettings(settings) {
-    return {
-        // Matches generated Int64+ result types and prevents JSON.parse precision loss.
-        output_format_json_quote_64bit_integers: 1,
-        ...settings,
-    };
-}
+import { consumeResultWithAbort } from '../utils/abortable-result.js';
+import { throwIfAborted } from '../utils/abort.js';
+import { createClickHouseClient, deriveClickHouseNamespace, } from '../utils/clickhouse-adapter-config.js';
+import { buildIntegerJsonSettings, createReadonlyIntegerJsonError, } from '../utils/integer-json-encoding.js';
 export class ClickHouseAdapter {
-    config;
     name = 'clickhouse';
     namespace;
     client;
+    /** Connection-level settings, so they can outrank the adapter's own defaults. */
+    configSettings;
+    integerJsonEncoding;
     constructor(config) {
-        this.config = config;
-        this.namespace = deriveNamespace(config);
+        this.namespace = deriveClickHouseNamespace(config);
         this.client = createClickHouseClient(config);
+        this.configSettings = config.clickhouse_settings;
+        this.integerJsonEncoding = config.integerJsonEncoding ?? 'quoted';
+    }
+    /**
+     * Converts only rejections of the adapter-owned precision setting into an
+     * actionable configuration error. Caller-owned settings and unrelated
+     * readonly failures retain their original error identity.
+     */
+    async withReadonlyGuidance(optionSettings, send) {
+        const attempt = buildIntegerJsonSettings(this.integerJsonEncoding, this.configSettings, optionSettings);
+        try {
+            return await send(attempt.settings);
+        }
+        catch (error) {
+            const guidanceError = createReadonlyIntegerJsonError(error, attempt.adapterDefaultApplied);
+            throw guidanceError ?? error;
+        }
     }
     async query(sql, params = [], options) {
+        // The ClickHouse clients never check an already-aborted signal, so fail before sending anything.
+        throwIfAborted(options?.abortSignal);
         const finalSQL = substituteParameters(sql, params);
-        const result = await this.client.query({
+        const result = await this.withReadonlyGuidance(options?.clickhouseSettings, clickhouseSettings => this.client.query({
             query: finalSQL,
             format: 'JSONEachRow',
-            clickhouse_settings: jsonOutputSettings(options?.clickhouseSettings),
+            clickhouse_settings: clickhouseSettings,
             query_id: options?.queryId,
-        });
-        return result.json();
+            abort_signal: options?.abortSignal,
+        }));
+        // The web client types `json()` as the union of every format's shape; with
+        // `format: 'JSONEachRow'` it is always a row array.
+        return consumeResultWithAbort(options?.abortSignal, result, () => result.json());
     }
     async stream(sql, params = [], options) {
+        throwIfAborted(options?.abortSignal);
         const finalSQL = substituteParameters(sql, params);
-        const result = await this.client.query({
+        const result = await this.withReadonlyGuidance(options?.clickhouseSettings, clickhouseSettings => this.client.query({
             query: finalSQL,
             format: 'JSONEachRow',
-            clickhouse_settings: jsonOutputSettings(options?.clickhouseSettings),
+            clickhouse_settings: clickhouseSettings,
             query_id: options?.queryId,
-        });
+            abort_signal: options?.abortSignal,
+        }));
         const stream = result.stream();
-        return createJsonEachRowStream(stream);
+        return createJsonEachRowStream(stream, options?.abortSignal);
     }
     async insert(table, rows, options) {
+        throwIfAborted(options?.abortSignal);
         assertSafeInsertIdentifiers(table, options?.columns);
         const result = await this.client.insert({
             table,
@@ -73,6 +77,7 @@ export class ClickHouseAdapter {
                 ...options?.clickhouseSettings,
             },
             query_id: options?.queryId,
+            abort_signal: options?.abortSignal,
         });
         return {
             queryId: result.query_id,

package/dist/core/adapters/database-adapter.d.ts

@@ -2,10 +2,12 @@ import type { ClickHouseSettings, ClickHouseSummary } from '@clickhouse/client-c
 export interface QueryExecutionOptions {
     clickhouseSettings?: ClickHouseSettings;
     queryId?: string;
+    abortSignal?: AbortSignal;
 }
 export interface InsertExecutionOptions {
     clickhouseSettings?: ClickHouseSettings;
     queryId?: string;
+    abortSignal?: AbortSignal;
     /** Explicit column subset; adapters must preserve it so omitted columns take table DEFAULTs. */
     columns?: string[];
 }

package/dist/core/adapters/database-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database-adapter.d.ts","sourceRoot":"","sources":["../../../src/core/adapters/database-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEvF,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gGAAgG;IAChG,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,uFAAuF;IACvF,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,mFAAmF;IACnF,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACzF,sFAAsF;IACtF,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3G;;;;;OAKG;IACH,MAAM,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,CAAC,EAAE,EACT,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAChC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;CAClD"}
+{"version":3,"file":"database-adapter.d.ts","sourceRoot":"","sources":["../../../src/core/adapters/database-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEvF,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,MAAM,WAAW,sBAAsB;IACrC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,gGAAgG;IAChG,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,uFAAuF;IACvF,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,mFAAmF;IACnF,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACzF,sFAAsF;IACtF,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3G;;;;;OAKG;IACH,MAAM,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,CAAC,EAAE,EACT,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAChC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;CAClD"}

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,CA2J5B"}
+{"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;AA8DnF,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,CAyM5B"}

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

@@ -1,5 +1,7 @@
 import { computeCacheKey } from './key.js';
 import { mergeCacheOptions } from './runtime-context.js';
+import { joinSharedFetch } from './shared-fetch.js';
+import { raceWithAbort, throwIfAborted } from '../utils/abort.js';
 import { logger } from '../utils/logger.js';
 function isCacheable(options) {
     const ttl = options.ttlMs ?? 0;
@@ -33,6 +35,7 @@ async function logCacheHit({ sql, parameters, status, cacheKey, options, rowCoun
     });
 }
 export async function executeWithCache(builder, options) {
+    throwIfAborted(options?.abortSignal);
     const runtime = builder.getRuntimeContext();
     const provider = runtime.provider;
     const normalizedExecuteCache = options?.cache === false
@@ -56,7 +59,7 @@ export async function executeWithCache(builder, options) {
         version: runtime.versionTag,
         tableName
     });
-    const entry = await activeProvider.get(key);
+    const entry = await raceWithAbort(activeProvider.get(key), options?.abortSignal);
     if (!entry) {
         runtime.parsedValues.delete(key);
     }
@@ -65,13 +68,14 @@ export async function executeWithCache(builder, options) {
     const deserialize = mergedOptions.deserialize || runtime.deserialize;
     const serialize = mergedOptions.serialize || runtime.serialize;
     const respondFromCache = async (cacheEntry, status) => {
+        throwIfAborted(options?.abortSignal);
         const memoized = runtime.parsedValues.get(key);
         let rows;
         if (memoized && memoized.createdAt === cacheEntry.createdAt) {
             rows = memoized.rows;
         }
         else {
-            rows = await deserialize(cacheEntry.value);
+            rows = await raceWithAbort(Promise.resolve().then(() => deserialize(cacheEntry.value)), options?.abortSignal);
             runtime.parsedValues.set(key, { createdAt: cacheEntry.createdAt, rows, tags: cacheEntry.tags });
         }
         const cacheAge = Date.now() - cacheEntry.createdAt;
@@ -81,7 +85,7 @@ export async function executeWithCache(builder, options) {
         else if (status === 'stale-hit') {
             runtime.stats.staleHits += 1;
         }
-        await logCacheHit({
+        await raceWithAbort(logCacheHit({
             sql,
             parameters,
             status,
@@ -90,7 +94,7 @@ export async function executeWithCache(builder, options) {
             rowCount: cacheEntry.rowCount ?? rows.length,
             ageMs: cacheAge,
             queryId: options?.queryId
-        });
+        }), options?.abortSignal);
         return rows;
     };
     if (mode === 'cache-first') {
@@ -98,7 +102,7 @@ export async function executeWithCache(builder, options) {
             return respondFromCache(entry, 'hit');
         }
         runtime.stats.misses += 1;
-        return fetchAndStore('miss');
+        return fetchAndStore('miss', options?.abortSignal);
     }
     if (mode === 'stale-while-revalidate') {
         if (entry && fresh) {
@@ -109,14 +113,18 @@ export async function executeWithCache(builder, options) {
             return respondFromCache(entry, 'stale-hit');
         }
         runtime.stats.misses += 1;
-        return fetchAndStore('miss');
+        return fetchAndStore('miss', options?.abortSignal);
     }
     if (mode === 'network-first') {
         try {
             runtime.stats.misses += 1;
-            return await fetchAndStore('miss');
+            return await fetchAndStore('miss', options?.abortSignal);
         }
         catch (error) {
+            // An abort is a caller decision, not a network failure staleIfError should mask.
+            if (options?.abortSignal?.aborted) {
+                throw error;
+            }
             if (mergedOptions.staleIfError && entry && staleAcceptable) {
                 return respondFromCache(entry, 'stale-hit');
             }
@@ -124,16 +132,43 @@ export async function executeWithCache(builder, options) {
         }
     }
     return runWithoutCache('bypass');
-    async function fetchAndStore(cacheStatus) {
-        if (mergedOptions.dedupe !== false && runtime.inFlight.has(key)) {
-            return runtime.inFlight.get(key);
+    async function fetchAndStore(cacheStatus, abortSignal) {
+        // A pre-aborted creator would otherwise start a zero-waiter fetch nobody can cancel.
+        throwIfAborted(abortSignal);
+        if (mergedOptions.dedupe === false) {
+            return runFetch(cacheStatus, abortSignal);
+        }
+        // A cancelled fetch lingers in the map until its promise settles.
+        let shared = runtime.inFlight.get(key);
+        if (!shared || shared.controller.signal.aborted) {
+            const controller = new AbortController();
+            const created = {
+                promise: runFetch(cacheStatus, controller.signal),
+                controller,
+                abortableWaiters: 0,
+                pinnedWaiters: 0
+            };
+            runtime.inFlight.set(key, created);
+            created.promise
+                .catch(() => undefined)
+                .finally(() => {
+                if (runtime.inFlight.get(key) === created) {
+                    runtime.inFlight.delete(key);
+                }
+            });
+            shared = created;
         }
-        const promise = (async () => {
+        return joinSharedFetch(shared, abortSignal);
+    }
+    function runFetch(cacheStatus, abortSignal) {
+        return (async () => {
             const rows = await builder.getExecutor().execute({
                 queryId: options?.queryId,
+                abortSignal,
                 logContext: { cacheStatus, cacheKey: key, cacheMode: mode }
             });
-            const encoded = await serialize(rows);
+            throwIfAborted(abortSignal);
+            const encoded = await raceWithAbort(Promise.resolve().then(() => serialize(rows)), abortSignal);
             const ttlMs = mergedOptions.ttlMs ?? 0;
             const staleTtlMs = mergedOptions.staleTtlMs ?? 0;
             const cacheTimeMs = mergedOptions.cacheTimeMs ?? ttlMs + staleTtlMs;
@@ -150,18 +185,23 @@ export async function executeWithCache(builder, options) {
                 byteSize: encoded.byteSize,
                 sqlFingerprint: key
             };
-            await activeProvider.set(key, newEntry);
+            const write = runtime.mutations.enqueueWrite({
+                key,
+                namespace,
+                tags: newEntry.tags || []
+            }, async () => {
+                // A queued write whose caller was cancelled before it started is safe to skip.
+                throwIfAborted(abortSignal);
+                await activeProvider.set(key, newEntry);
+            });
+            await raceWithAbort(write, abortSignal);
             runtime.parsedValues.set(key, { createdAt: newEntry.createdAt, rows, tags: newEntry.tags });
             return rows;
         })();
-        if (mergedOptions.dedupe !== false) {
-            runtime.inFlight.set(key, promise);
-            promise.finally(() => runtime.inFlight.delete(key));
-        }
-        return promise;
     }
     function scheduleRevalidation() {
         runtime.stats.revalidations += 1;
+        // Background refresh serves later callers, so it must outlive the aborting one.
         fetchAndStore('revalidate').catch(() => undefined);
     }
     function runWithoutCache(cacheStatus) {
@@ -170,6 +210,7 @@ export async function executeWithCache(builder, options) {
         }
         return builder.getExecutor().execute({
             queryId: options?.queryId,
+            abortSignal: options?.abortSignal,
             logContext: { cacheStatus, cacheMode: mode }
         });
     }

package/dist/core/cache/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/core/cache/controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,qBAAa,eAAe;IACd,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,mBAAmB;IAE1C,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,QAAQ,IAAI,UAAU,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;IAO5C,OAAO,CAAC,wBAAwB;CAWjC"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/core/cache/controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,qBAAa,eAAe;IACd,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,mBAAmB;IAE1C,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWzC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB7C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAYtB,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,QAAQ,IAAI,UAAU,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;IAO5C,OAAO,CAAC,wBAAwB;CAWjC"}

package/dist/core/cache/controller.js

@@ -5,15 +5,17 @@ export class CacheController {
         this.context = context;
     }
     async invalidateKey(key) {
+        const provider = this.context.provider;
+        if (provider) {
+            await this.context.mutations.invalidate(scope => scope.key === key, () => provider.delete(key));
+        }
         this.context.parsedValues.delete(key);
-        if (!this.context.provider)
-            return;
-        await this.context.provider.delete(key);
     }
     async invalidateTags(tags) {
         if (!tags.length)
             return;
-        const deleteByTag = this.context.provider?.deleteByTag;
+        const provider = this.context.provider;
+        const deleteByTag = provider?.deleteByTag;
         if (!deleteByTag) {
             logger.warn('Cache provider does not support tag invalidation. Tags ignored.', {
                 namespace: this.context.namespace,
@@ -22,12 +24,18 @@ export class CacheController {
             this.removeParsedValuesByTags(tags);
             return;
         }
-        await Promise.all(tags.map(tag => deleteByTag.call(this.context.provider, this.context.namespace, tag)));
+        const target = new Set(tags);
+        await this.context.mutations.invalidate(scope => scope.namespace === this.context.namespace
+            && scope.tags.some(tag => target.has(tag)), async () => {
+            await Promise.all(tags.map(tag => deleteByTag.call(provider, this.context.namespace, tag)));
+        });
         this.removeParsedValuesByTags(tags);
     }
     async clear() {
-        if (this.context.provider?.clearNamespace) {
-            await this.context.provider.clearNamespace(this.context.namespace);
+        const provider = this.context.provider;
+        const clearNamespace = provider?.clearNamespace;
+        if (clearNamespace) {
+            await this.context.mutations.invalidate(scope => scope.namespace === this.context.namespace, () => clearNamespace.call(provider, this.context.namespace));
         }
         this.context.parsedValues.clear();
     }

package/dist/core/cache/mutation-coordinator.d.ts

@@ -0,0 +1,20 @@
+export interface CacheWriteScope {
+    key: string;
+    namespace: string;
+    tags: readonly string[];
+}
+type ScopeMatcher = (scope: CacheWriteScope) => boolean;
+/**
+ * Orders writes and invalidations without serializing mutations for unrelated
+ * keys. Earlier matching writes finish before an invalidation, while matching
+ * writes registered afterward wait for that invalidation to finish.
+ */
+export declare class CacheMutationCoordinator {
+    private tails;
+    private pendingWrites;
+    private pendingInvalidations;
+    enqueueWrite(scope: CacheWriteScope, write: () => Promise<void>): Promise<void>;
+    invalidate(matches: ScopeMatcher, operation: () => Promise<void>): Promise<void>;
+}
+export {};
+//# sourceMappingURL=mutation-coordinator.d.ts.map

package/dist/core/cache/mutation-coordinator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mutation-coordinator.d.ts","sourceRoot":"","sources":["../../../src/core/cache/mutation-coordinator.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;CACzB;AAED,KAAK,YAAY,GAAG,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,CAAC;AAgBxD;;;;GAIG;AACH,qBAAa,wBAAwB;IACnC,OAAO,CAAC,KAAK,CAAoC;IACjD,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,oBAAoB,CAAkC;IAE9D,YAAY,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB/E,UAAU,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAuBjF"}

package/dist/core/cache/mutation-coordinator.js

@@ -0,0 +1,56 @@
+function settle(operation) {
+    return operation.catch(() => undefined);
+}
+/**
+ * Orders writes and invalidations without serializing mutations for unrelated
+ * keys. Earlier matching writes finish before an invalidation, while matching
+ * writes registered afterward wait for that invalidation to finish.
+ */
+export class CacheMutationCoordinator {
+    tails = new Map();
+    pendingWrites = new Set();
+    pendingInvalidations = new Set();
+    enqueueWrite(scope, write) {
+        const previous = this.tails.get(scope.key);
+        const invalidations = Array.from(this.pendingInvalidations)
+            .filter(invalidation => invalidation.matches(scope))
+            .map(invalidation => settle(invalidation.promise));
+        const prerequisites = previous
+            ? [settle(previous), ...invalidations]
+            : invalidations;
+        const current = Promise.all(prerequisites).then(() => write());
+        const pending = { scope, promise: current };
+        this.tails.set(scope.key, current);
+        this.pendingWrites.add(pending);
+        void current
+            .finally(() => {
+            this.pendingWrites.delete(pending);
+            if (this.tails.get(scope.key) === current) {
+                this.tails.delete(scope.key);
+            }
+        })
+            .catch(() => undefined);
+        return current;
+    }
+    invalidate(matches, operation) {
+        const writes = Array.from(this.pendingWrites)
+            .filter(write => matches(write.scope))
+            .map(write => settle(write.promise));
+        // Invalidation is rare, and serializing overlapping calls makes their
+        // ordering deterministic without blocking unrelated cache writes.
+        const invalidations = Array.from(this.pendingInvalidations)
+            .map(invalidation => settle(invalidation.promise));
+        const current = Promise.all([...writes, ...invalidations])
+            .then(() => operation());
+        const pending = { matches, promise: current };
+        // Register the barrier synchronously so later matching writes cannot race
+        // the provider operation while this invalidation waits for earlier writes.
+        this.pendingInvalidations.add(pending);
+        void current
+            .finally(() => {
+            this.pendingInvalidations.delete(pending);
+        })
+            .catch(() => undefined);
+        return current;
+    }
+}

package/dist/core/cache/runtime-context.d.ts

@@ -1,4 +1,6 @@
 import type { CacheConfig, CacheOptions, CacheProvider, CacheSerializeFn, CacheDeserializeFn, CacheStats } from './types.js';
+import type { SharedFetch } from './shared-fetch.js';
+import { CacheMutationCoordinator } from './mutation-coordinator.js';
 export interface QueryRuntimeContext {
     provider?: CacheProvider;
     defaults: CacheOptions;
@@ -6,7 +8,8 @@ export interface QueryRuntimeContext {
     versionTag: string;
     serialize: CacheSerializeFn;
     deserialize: CacheDeserializeFn;
-    inFlight: Map<string, Promise<unknown>>;
+    inFlight: Map<string, SharedFetch>;
+    mutations: CacheMutationCoordinator;
     stats: CacheStats;
     parsedValues: Map<string, ParsedValueEntry>;
 }

package/dist/core/cache/runtime-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-context.d.ts","sourceRoot":"","sources":["../../../src/core/cache/runtime-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,UAAU,EACX,MAAM,YAAY,CAAC;AAWpB,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACxC,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,wBAAgB,gBAAgB,IAAI,UAAU,CAE7C;AAQD,wBAAgB,iBAAiB,CAAC,GAAG,UAAU,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAe9F;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC;IACvB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,WAAW,EAAE,kBAAkB,CAAC;CACjC;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,GAAG,mBAAmB,CAYnF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,iBAAiB,EAAE,MAAM,GAAG,kBAAkB,CAUjH"}
+{"version":3,"file":"runtime-context.d.ts","sourceRoot":"","sources":["../../../src/core/cache/runtime-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,UAAU,EACX,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAUrE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACnC,SAAS,EAAE,wBAAwB,CAAC;IACpC,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,wBAAgB,gBAAgB,IAAI,UAAU,CAE7C;AAQD,wBAAgB,iBAAiB,CAAC,GAAG,UAAU,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAe9F;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC;IACvB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,WAAW,EAAE,kBAAkB,CAAC;CACjC;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,GAAG,mBAAmB,CAanF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,iBAAiB,EAAE,MAAM,GAAG,kBAAkB,CAUjH"}

package/dist/core/cache/runtime-context.js

@@ -1,4 +1,5 @@
 import { defaultSerialize, defaultDeserialize } from './serialization.js';
+import { CacheMutationCoordinator } from './mutation-coordinator.js';
 const DEFAULT_CACHE_OPTIONS = {
     mode: 'no-store',
     ttlMs: 0,
@@ -41,6 +42,7 @@ export function buildRuntimeContext(config) {
         serialize: config.serialize,
         deserialize: config.deserialize,
         inFlight: new Map(),
+        mutations: new CacheMutationCoordinator(),
         stats: createCacheStats(),
         parsedValues: new Map()
     };

package/dist/core/cache/shared-fetch.d.ts

@@ -0,0 +1,14 @@
+/** One deduplicated execution shared by every caller of the same cache key. */
+export interface SharedFetch {
+    promise: Promise<unknown>;
+    controller: AbortController;
+    abortableWaiters: number;
+    pinnedWaiters: number;
+}
+/**
+ * Joins a caller to a shared fetch without allowing that caller to cancel
+ * anyone else. The underlying fetch is aborted only after its final waiter
+ * leaves.
+ */
+export declare function joinSharedFetch<T>(shared: SharedFetch, abortSignal?: AbortSignal): Promise<T>;
+//# sourceMappingURL=shared-fetch.d.ts.map

package/dist/core/cache/shared-fetch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared-fetch.d.ts","sourceRoot":"","sources":["../../../src/core/cache/shared-fetch.ts"],"names":[],"mappings":"AAEA,+EAA+E;AAC/E,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1B,UAAU,EAAE,eAAe,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAyC7F"}

package/dist/core/cache/shared-fetch.js

@@ -0,0 +1,43 @@
+import { abortReason } from '../utils/abort.js';
+/**
+ * Joins a caller to a shared fetch without allowing that caller to cancel
+ * anyone else. The underlying fetch is aborted only after its final waiter
+ * leaves.
+ */
+export function joinSharedFetch(shared, abortSignal) {
+    if (!abortSignal) {
+        shared.pinnedWaiters += 1;
+        return shared.promise.finally(() => {
+            shared.pinnedWaiters -= 1;
+        });
+    }
+    if (abortSignal.aborted) {
+        return Promise.reject(abortReason(abortSignal));
+    }
+    shared.abortableWaiters += 1;
+    return new Promise((resolve, reject) => {
+        let waiting = true;
+        const leave = () => {
+            if (!waiting)
+                return;
+            waiting = false;
+            shared.abortableWaiters -= 1;
+            abortSignal.removeEventListener('abort', onAbort);
+        };
+        const onAbort = () => {
+            leave();
+            if (shared.abortableWaiters === 0 && shared.pinnedWaiters === 0) {
+                shared.controller.abort(abortSignal.reason);
+            }
+            reject(abortReason(abortSignal));
+        };
+        abortSignal.addEventListener('abort', onAbort, { once: true });
+        shared.promise.then(value => {
+            leave();
+            resolve(value);
+        }, error => {
+            leave();
+            reject(error);
+        });
+    });
+}

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

@@ -3,8 +3,12 @@ import { QueryBuilder } from '../query-builder.js';
 import { type QueryLog } from '../utils/logger.js';
 interface ExecutorRunOptions {
     queryId?: string;
+    abortSignal?: AbortSignal;
     logContext?: Partial<QueryLog>;
 }
+interface ExecutorStreamOptions {
+    abortSignal?: AbortSignal;
+}
 export declare class ExecutorFeature<Schema extends SchemaDefinition<Schema>, State extends BuilderState<Schema, string, any, keyof Schema, Partial<Record<string, keyof Schema>>, any, any>> {
     private builder;
     constructor(builder: QueryBuilder<Schema, State>);
@@ -14,7 +18,7 @@ export declare class ExecutorFeature<Schema extends SchemaDefinition<Schema>, St
     };
     toSQL(): string;
     execute(options?: ExecutorRunOptions): Promise<State['output'][]>;
-    stream(): Promise<ReadableStream<State['output'][]>>;
+    stream(options?: ExecutorStreamOptions): Promise<ReadableStream<State['output'][]>>;
     private compileQuery;
 }
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/core/features/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAU,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAG3D,UAAU,kBAAkB;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAChC;AAED,qBAAa,eAAe,CAC1B,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC;IAElG,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAExD,eAAe,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,GAAG,EAAE,CAAA;KAAE;IAKrD,KAAK,IAAI,MAAM;IAMT,OAAO,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;IAqDjE,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IA+C1D,OAAO,CAAC,YAAY;CAMrB"}
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/core/features/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAU,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAG3D,UAAU,kBAAkB;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAChC;AAED,UAAU,qBAAqB;IAC7B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,eAAe,CAC1B,MAAM,SAAS,gBAAgB,CAAC,MAAM,CAAC,EACvC,KAAK,SAAS,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC;IAElG,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAExD,eAAe,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,GAAG,EAAE,CAAA;KAAE;IAKrD,KAAK,IAAI,MAAM;IAMT,OAAO,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;IAsDjE,MAAM,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAgDzF,OAAO,CAAC,YAAY;CAMrB"}

package/dist/core/features/executor.js

@@ -31,6 +31,7 @@ export class ExecutorFeature {
             const rows = await adapter.query(sql, parameters, {
                 clickhouseSettings: queryNode.settings,
                 queryId: options?.queryId,
+                abortSignal: options?.abortSignal,
             });
             const endTime = Date.now();
             logger.logQuery({
@@ -63,7 +64,7 @@ export class ExecutorFeature {
             throw error;
         }
     }
-    async stream() {
+    async stream(options) {
         const adapter = this.builder.getAdapter();
         const queryNode = this.builder.toQueryNode();
         const { sql, parameters } = this.toSQLWithParams();
@@ -80,6 +81,7 @@ export class ExecutorFeature {
             }
             const webStream = await adapter.stream(sql, parameters, {
                 clickhouseSettings: queryNode.settings,
+                abortSignal: options?.abortSignal,
             });
             const endTime = Date.now();
             logger.logQuery({