@querypanel/node-sdk 1.0.17 → 1.0.19

package/dist/cjs/__tests__/ingest.test.d.ts

@@ -0,0 +1,5 @@
+declare global {
+    var fetch: typeof globalThis.fetch;
+}
+export {};
+//# sourceMappingURL=ingest.test.d.ts.map

package/dist/cjs/__tests__/ingest.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ingest.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/ingest.test.ts"],"names":[],"mappings":"AAKA,OAAO,CAAC,MAAM,CAAC;IAEX,IAAI,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACtC"}

package/dist/cjs/__tests__/ingest.test.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const index_js_1 = require("../index.js");
+const noop = () => { };
+class StubConnector {
+    constructor(introspection) {
+        this.introspection = introspection;
+        this.connect = vitest_1.vi.fn(async () => { });
+        this.close = vitest_1.vi.fn(async () => { });
+        this.executeQuery = vitest_1.vi.fn(async () => []);
+        this.introspect = vitest_1.vi.fn(async (_options) => this.introspection);
+    }
+}
+(0, vitest_1.describe)('Ingestion API', () => {
+    const originalFetch = globalThis.fetch;
+    const fakeResponse = {
+        ok: true,
+        status: 200,
+        text: async () => JSON.stringify({ message: 'ok', ingestedTables: 1 }),
+    };
+    let fetchMock;
+    (0, vitest_1.beforeEach)(() => {
+        fetchMock = vitest_1.vi.fn().mockResolvedValue(fakeResponse);
+        globalThis.fetch = fetchMock;
+    });
+    (0, vitest_1.afterEach)(() => {
+        fetchMock.mockReset();
+        if (originalFetch) {
+            globalThis.fetch = originalFetch;
+        }
+        else {
+            delete globalThis.fetch;
+        }
+    });
+    (0, vitest_1.it)('posts schema introspection payloads with merged metadata', async () => {
+        const sdk = new index_js_1.QueryPanelSdkAPI('https://example.com', 'token');
+        const introspection = {
+            db: { kind: 'clickhouse', name: 'analytics' },
+            tables: [],
+            introspectedAt: new Date().toISOString(),
+            metadata: { existing: true },
+        };
+        const response = await sdk.ingestSchema(introspection, {
+            tenantId: 'tenant-1',
+            metadata: { triggeredBy: 'test' },
+        });
+        (0, vitest_1.expect)(response).toMatchObject({ message: 'ok', ingestedTables: 1 });
+        (0, vitest_1.expect)(fetchMock).toHaveBeenCalledTimes(1);
+        const [url, init] = fetchMock.mock.calls[0];
+        (0, vitest_1.expect)(url).toBe('https://example.com/ingest/schema');
+        (0, vitest_1.expect)(init.method).toBe('POST');
+        (0, vitest_1.expect)(init.headers).toMatchObject({
+            Authorization: 'Bearer token',
+            'Content-Type': 'application/json',
+        });
+        const body = JSON.parse(init.body);
+        (0, vitest_1.expect)(body.metadata).toEqual({ existing: true, triggeredBy: 'test' });
+    });
+    (0, vitest_1.it)('introspects via connector and closes connections by default', async () => {
+        const sdk = new index_js_1.QueryPanelSdkAPI('https://example.com', 'token');
+        const introspection = {
+            db: { kind: 'clickhouse', name: 'analytics' },
+            tables: [],
+            introspectedAt: new Date().toISOString(),
+        };
+        const connector = new StubConnector(introspection);
+        const response = await sdk.introspectAndIngest(connector, {
+            tenantId: 'tenant-1',
+            metadata: { flow: 'batch' },
+            tables: ['events'],
+        });
+        (0, vitest_1.expect)(response.message).toBe('ok');
+        (0, vitest_1.expect)(connector.connect).toHaveBeenCalledTimes(1);
+        (0, vitest_1.expect)(connector.introspect).toHaveBeenCalledWith({ tables: ['events'] });
+        (0, vitest_1.expect)(connector.close).toHaveBeenCalledTimes(1);
+        const [, init] = fetchMock.mock.calls[0];
+        const body = JSON.parse(init.body);
+        (0, vitest_1.expect)(body.metadata).toEqual({ flow: 'batch' });
+    });
+    (0, vitest_1.it)('respects keepConnectionOpen option', async () => {
+        const sdk = new index_js_1.QueryPanelSdkAPI('https://example.com', 'token');
+        const connector = new StubConnector({
+            db: { kind: 'clickhouse', name: 'analytics' },
+            tables: [],
+            introspectedAt: new Date().toISOString(),
+        });
+        await sdk.introspectAndIngest(connector, {
+            tenantId: 'tenant-1',
+            keepConnectionOpen: true,
+        });
+        (0, vitest_1.expect)(connector.close).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=ingest.test.js.map

package/dist/cjs/__tests__/ingest.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ingest.test.js","sourceRoot":"","sources":["../../../src/__tests__/ingest.test.ts"],"names":[],"mappings":"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"}

package/dist/cjs/connectors/__tests__/clickhouse.introspect.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=clickhouse.introspect.test.d.ts.map

package/dist/cjs/connectors/__tests__/clickhouse.introspect.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clickhouse.introspect.test.d.ts","sourceRoot":"","sources":["../../../../src/connectors/__tests__/clickhouse.introspect.test.ts"],"names":[],"mappings":""}

package/dist/cjs/connectors/__tests__/clickhouse.introspect.test.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const clickhouse_js_1 = require("../clickhouse.js");
+class StubResultSet {
+    constructor(payload) {
+        this.payload = payload;
+    }
+    async json() {
+        return this.payload;
+    }
+}
+class StubClickHouseClient {
+    constructor(responses) {
+        this.queries = [];
+        this.responses = responses;
+    }
+    async query(params) {
+        this.queries.push({ query: params.query, params: params.query_params });
+        const responseKey = params.query.includes('system.tables') ? 'tables' : 'columns';
+        const payload = this.responses.get(responseKey);
+        if (!payload) {
+            throw new Error(`No stub response registered for ${responseKey}`);
+        }
+        return new StubResultSet(payload);
+    }
+    async ping() {
+        return { success: true };
+    }
+    async close() { }
+}
+(0, vitest_1.describe)('ClickHouseConnector', () => {
+    (0, vitest_1.it)('introspects tables with large column counts', async () => {
+        const tableRows = [
+            {
+                name: 'events',
+                engine: 'MergeTree',
+                comment: 'User event stream',
+                total_rows: '424242',
+                total_bytes: '1024',
+                is_view: 0,
+                primary_key: 'tuple(event_id, occurred_at)',
+                sorting_key: 'tuple(occurred_at)',
+            },
+        ];
+        const columnRows = Array.from({ length: 120 }, (_, index) => ({
+            table: 'events',
+            name: `column_${index}`,
+            type: index % 2 === 0 ? 'Nullable(String)' : 'UInt32',
+            position: index + 1,
+            default_kind: index % 10 === 0 ? 'DEFAULT' : null,
+            default_expression: index % 10 === 0 ? `'value_${index}'` : null,
+            comment: index % 15 === 0 ? `Column ${index}` : null,
+            codec_expression: index % 20 === 0 ? 'ZSTD(3)' : null,
+            ttl_expression: null,
+            is_in_primary_key: index === 0 ? 1 : 0,
+            data_compressed_bytes: '128',
+            data_uncompressed_bytes: '256',
+        }));
+        const responses = new Map([
+            ['tables', tableRows],
+            ['columns', columnRows],
+        ]);
+        const stubClient = new StubClickHouseClient(responses);
+        const connector = new clickhouse_js_1.ClickHouseConnector({
+            database: 'analytics',
+        }, { client: stubClient });
+        const introspection = await connector.introspect();
+        (0, vitest_1.expect)(introspection.db).toEqual({ kind: 'clickhouse', name: 'analytics' });
+        (0, vitest_1.expect)(introspection.tables).toHaveLength(1);
+        const [table] = introspection.tables;
+        (0, vitest_1.expect)(table.name).toBe('events');
+        (0, vitest_1.expect)(table.columns).toHaveLength(120);
+        (0, vitest_1.expect)(table.columns[0]).toMatchObject({
+            name: 'column_0',
+            nullable: true,
+            type: 'String',
+            rawType: 'Nullable(String)',
+            defaultKind: 'DEFAULT',
+            defaultExpression: `'value_0'`,
+            statistics: { compressedBytes: 128, uncompressedBytes: 256 },
+        });
+        (0, vitest_1.expect)(table.columns.at(-1)).toMatchObject({
+            nullable: false,
+            type: 'UInt32',
+        });
+        (0, vitest_1.expect)(table.statistics).toEqual({ totalRows: 424242, totalBytes: 1024 });
+        (0, vitest_1.expect)(table.indexes).toEqual([
+            {
+                name: 'primary_key',
+                columns: ['event_id', 'occurred_at'],
+                unique: true,
+                type: 'PRIMARY KEY',
+                definition: 'tuple(event_id, occurred_at)',
+            },
+        ]);
+        (0, vitest_1.expect)(table.constraints[0]).toMatchObject({
+            type: 'PRIMARY KEY',
+            columns: ['event_id', 'occurred_at'],
+        });
+        (0, vitest_1.expect)(new Date(introspection.introspectedAt).toISOString()).toBe(introspection.introspectedAt);
+        (0, vitest_1.expect)(stubClient.queries).toHaveLength(2);
+        (0, vitest_1.expect)(stubClient.queries[0].params).toEqual({ db: 'analytics' });
+    });
+    (0, vitest_1.it)('applies table filters when provided', async () => {
+        const responses = new Map([
+            ['tables', [{ name: 'events', engine: 'MergeTree', is_view: 0 }]],
+            ['columns', [{ table: 'events', name: 'column_1', type: 'UInt64', position: 1 }]],
+        ]);
+        const stubClient = new StubClickHouseClient(responses);
+        const connector = new clickhouse_js_1.ClickHouseConnector({ database: 'analytics' }, { client: stubClient });
+        await connector.introspect({ tables: ['analytics.events', 'events'] });
+        (0, vitest_1.expect)(stubClient.queries).toHaveLength(2);
+        for (const query of stubClient.queries) {
+            (0, vitest_1.expect)(query.params).toEqual({ db: 'analytics', tables: ['events'] });
+        }
+    });
+});
+//# sourceMappingURL=clickhouse.introspect.test.js.map

package/dist/cjs/connectors/__tests__/clickhouse.introspect.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clickhouse.introspect.test.js","sourceRoot":"","sources":["../../../../src/connectors/__tests__/clickhouse.introspect.test.ts"],"names":[],"mappings":"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"}

package/dist/cjs/connectors/base.d.ts

@@ -1,13 +1,12 @@
-import type { DataFormat } from '@clickhouse/client';
 import type { IntrospectOptions, SchemaIntrospection } from '../schema/types.js';
 export interface QueryOptions {
     params?: Record<string, unknown>;
-    format?: DataFormat;
+    format?: string;
     settings?: Record<string, unknown>;
 }
 export interface DatabaseConnector {
     connect(): Promise<void>;
-    query<T = Record<string, unknown>>(sql: string, options?: QueryOptions): Promise<T[]>;
+    executeQuery<T = Record<string, unknown>>(query: string, options?: QueryOptions): Promise<T[]>;
     introspect(options?: IntrospectOptions): Promise<SchemaIntrospection>;
     close(): Promise<void>;
 }

package/dist/cjs/connectors/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/connectors/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEjF,MAAM,WAAW,YAAY;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,iBAAiB;IAC9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACtF,UAAU,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACtE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/connectors/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEjF,MAAM,WAAW,YAAY;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,iBAAiB;IAC9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,YAAY,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAC/F,UAAU,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACtE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}

package/dist/cjs/connectors/clickhouse.d.ts

@@ -1,12 +1,30 @@
-import { type ClickHouseClient, type ClickHouseClientConfigOptions } from "@clickhouse/client";
-import type { IntrospectOptions, SchemaIntrospection } from "../schema/types.js";
-import type { DatabaseConnector, QueryOptions } from "./base.js";
+import { type ClickHouseClientConfigOptions, type ClickHouseSettings } from '@clickhouse/client';
+import type { IntrospectOptions, SchemaIntrospection } from '../schema/types.js';
+import type { DatabaseConnector, QueryOptions } from './base.js';
+interface ResultSetLike {
+    json<T = unknown>(): Promise<T>;
+}
+interface ClickHouseClientLike {
+    query(params: {
+        query: string;
+        format?: string;
+        query_params?: Record<string, unknown>;
+        clickhouse_settings?: ClickHouseSettings;
+    }): Promise<ResultSetLike>;
+    ping(): Promise<{
+        success: boolean;
+        error?: Error;
+    } | {
+        success?: boolean;
+    }>;
+    close(): Promise<void>;
+}
 export interface ClickHouseConnectorConfig {
     /** Fully qualified ClickHouse URL. Overrides host/port/protocol when provided. */
     url?: string;
     host?: string;
     port?: number;
-    protocol?: "http" | "https";
+    protocol?: 'http' | 'https';
     database: string;
     username?: string;
     password?: string;
@@ -15,21 +33,21 @@ export interface ClickHouseConnectorConfig {
     clientOptions?: Partial<ClickHouseClientConfigOptions>;
 }
 export interface ClickHouseConnectorOverrides {
-    client?: ClickHouseClient;
-    clientFactory?: () => ClickHouseClient;
+    client?: ClickHouseClientLike;
+    clientFactory?: () => ClickHouseClientLike;
 }
 export declare class ClickHouseConnector implements DatabaseConnector {
+    private client;
     private readonly config;
     private readonly overrides;
-    private client;
-    private readonly defaultFormat;
+    private defaultFormat;
     constructor(config: ClickHouseConnectorConfig, overrides?: ClickHouseConnectorOverrides);
     connect(): Promise<void>;
-    query<T = Record<string, unknown>>(sql: string, options?: QueryOptions): Promise<T[]>;
+    executeQuery<T = Record<string, unknown>>(query: string, options?: QueryOptions): Promise<T[]>;
     introspect(options?: IntrospectOptions): Promise<SchemaIntrospection>;
     close(): Promise<void>;
     private ensureClient;
-    private safePing;
     private buildClientConfig;
 }
+export {};
 //# sourceMappingURL=clickhouse.d.ts.map

package/dist/cjs/connectors/clickhouse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse.d.ts","sourceRoot":"","sources":["../../../src/connectors/clickhouse.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,gBAAgB,EACrB,KAAK,6BAA6B,EAIlC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAEX,iBAAiB,EACjB,mBAAmB,EAEnB,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,MAAM,WAAW,yBAAyB;IACzC,kFAAkF;IAClF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAC,6BAA6B,CAAC,CAAC;CACvD;AAED,MAAM,WAAW,4BAA4B;IAC5C,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,gBAAgB,CAAC;CACvC;AA4BD,qBAAa,mBAAoB,YAAW,iBAAiB;IAO3D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAP3B,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAEC;gBAGb,MAAM,EAAE,yBAAyB,EACjC,SAAS,GAAE,4BAAiC;IAKxD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,YAAY,GACpB,OAAO,CAAC,CAAC,EAAE,CAAC;IAmCT,UAAU,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAyGrE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAMd,YAAY;YAcZ,QAAQ;IAYtB,OAAO,CAAC,iBAAiB;CAkCzB"}
+{"version":3,"file":"clickhouse.d.ts","sourceRoot":"","sources":["../../../src/connectors/clickhouse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,6BAA6B,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC/G,OAAO,KAAK,EAAgB,iBAAiB,EAAE,mBAAmB,EAAe,MAAM,oBAAoB,CAAC;AAE5G,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,UAAU,aAAa;IACnB,IAAI,CAAC,CAAC,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CACnC;AAED,UAAU,oBAAoB;IAC1B,KAAK,CAAC,MAAM,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,mBAAmB,CAAC,EAAE,kBAAkB,CAAC;KAC5C,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3B,IAAI,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GAAG;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC7E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,yBAAyB;IACtC,kFAAkF;IAClF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAC,6BAA6B,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,4BAA4B;IACzC,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,oBAAoB,CAAC;CAC9C;AA4BD,qBAAa,mBAAoB,YAAW,iBAAiB;IACzD,OAAO,CAAC,MAAM,CAA8B;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D,OAAO,CAAC,aAAa,CAAyB;gBAElC,MAAM,EAAE,yBAAyB,EAAE,SAAS,CAAC,EAAE,4BAA4B;IAQjF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,YAAY,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAsB9F,UAAU,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAqGrE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAMd,YAAY;IAY1B,OAAO,CAAC,iBAAiB;CA+B5B"}

package/dist/cjs/connectors/clickhouse.js

@@ -4,38 +4,32 @@ exports.ClickHouseConnector = void 0;
 const client_1 = require("@clickhouse/client");
 const clickhouse_js_1 = require("../utils/clickhouse.js");
 class ClickHouseConnector {
-    constructor(config, overrides = {}) {
+    constructor(config, overrides) {
+        this.overrides = {};
+        this.defaultFormat = 'JSONEachRow';
         this.config = config;
-        this.overrides = overrides;
-        this.defaultFormat = "JSONEachRow";
-        this.client = overrides.client ?? null;
+        if (overrides) {
+            this.overrides = overrides;
+        }
+        this.client = overrides?.client ?? null;
     }
     async connect() {
         await this.ensureClient();
     }
-    async query(sql, options) {
+    async executeQuery(query, options) {
         const client = await this.ensureClient();
-        const params = {
-            query: sql,
-        };
         const format = options?.format ?? this.defaultFormat;
-        if (format) {
-            Object.assign(params, { format });
-        }
-        if (options?.params) {
-            Object.assign(params, { query_params: options.params });
-        }
-        if (options?.settings) {
-            Object.assign(params, {
-                clickhouse_settings: options.settings,
-            });
-        }
-        const result = await client.query(params);
+        const result = await client.query({
+            query,
+            format,
+            query_params: options?.params,
+            clickhouse_settings: options?.settings,
+        });
         const payload = await result.json();
         if (Array.isArray(payload)) {
             return payload;
         }
-        if (payload && typeof payload === "object") {
+        if (payload && typeof payload === 'object') {
             const maybeData = payload.data;
             if (Array.isArray(maybeData)) {
                 return maybeData;
@@ -52,42 +46,45 @@ class ClickHouseConnector {
         if (hasFilter) {
             queryParams.tables = allowTables;
         }
-        const filterClause = hasFilter ? " AND name IN {tables:Array(String)}" : "";
-        const tables = await this.query(`SELECT name, engine, comment, total_rows, total_bytes, is_view, primary_key, sorting_key
+        const filterClause = hasFilter ? ' AND name IN {tables:Array(String)}' : '';
+        const tables = await this.executeQuery(`SELECT name, engine, comment, total_rows, total_bytes, is_view, primary_key, sorting_key
              FROM system.tables
              WHERE database = {db:String}${filterClause}
              ORDER BY name`, { params: queryParams });
-        const columnFilterClause = hasFilter
-            ? " AND table IN {tables:Array(String)}"
-            : "";
-        const columns = await this.query(`SELECT table, name, type, position, default_kind, default_expression, comment,
+        const columnFilterClause = hasFilter ? ' AND table IN {tables:Array(String)}' : '';
+        const columns = await this.executeQuery(`SELECT table, name, type, position, default_kind, default_expression, comment,
                     codec_expression, ttl_expression, is_in_primary_key,
                     data_compressed_bytes, data_uncompressed_bytes
              FROM system.columns
              WHERE database = {db:String}${columnFilterClause}
              ORDER BY table, position`, { params: queryParams });
         const columnsByTable = new Map();
-        for (const rawColumn of columns) {
-            const list = columnsByTable.get(rawColumn.table) ?? [];
-            list.push(transformColumnRow(rawColumn));
-            columnsByTable.set(rawColumn.table, list);
+        for (const col of columns) {
+            const list = columnsByTable.get(col.table) ?? [];
+            list.push(transformColumnRow(col));
+            columnsByTable.set(col.table, list);
         }
         const tableSchemas = tables.map((table) => {
             const tableColumns = columnsByTable.get(table.name) ?? [];
             const primaryKeyColumns = (0, clickhouse_js_1.parseKeyExpression)(table.primary_key);
             const totalRows = toNumber(table.total_rows);
             const totalBytes = toNumber(table.total_bytes);
-            for (const column of tableColumns) {
-                column.isPrimaryKey =
-                    column.isPrimaryKey || primaryKeyColumns.includes(column.name);
+            let statistics;
+            if (totalRows !== undefined || totalBytes !== undefined) {
+                const s = {};
+                if (totalRows !== undefined)
+                    s.totalRows = totalRows;
+                if (totalBytes !== undefined)
+                    s.totalBytes = totalBytes;
+                statistics = s;
             }
             const indexes = primaryKeyColumns.length
                 ? [
                     {
-                        name: "primary_key",
+                        name: 'primary_key',
                         columns: primaryKeyColumns,
                         unique: true,
-                        type: "PRIMARY KEY",
+                        type: 'PRIMARY KEY',
                         ...(table.primary_key ? { definition: table.primary_key } : {}),
                     },
                 ]
@@ -95,12 +92,15 @@ class ClickHouseConnector {
             const constraints = primaryKeyColumns.length
                 ? [
                     {
-                        name: "primary_key",
-                        type: "PRIMARY KEY",
+                        name: 'primary_key',
+                        type: 'PRIMARY KEY',
                         columns: primaryKeyColumns,
                     },
                 ]
                 : [];
+            for (const column of tableColumns) {
+                column.isPrimaryKey = column.isPrimaryKey || primaryKeyColumns.includes(column.name);
+            }
             const base = {
                 name: table.name,
                 schema: this.config.database,
@@ -114,7 +114,6 @@ class ClickHouseConnector {
             if (comment !== undefined) {
                 base.comment = comment;
             }
-            const statistics = buildTableStatistics(totalRows, totalBytes);
             if (statistics) {
                 base.statistics = statistics;
             }
@@ -122,7 +121,7 @@ class ClickHouseConnector {
         });
         return {
             db: {
-                kind: "clickhouse",
+                kind: 'clickhouse',
                 name: this.config.database,
             },
             tables: tableSchemas,
@@ -139,35 +138,23 @@ class ClickHouseConnector {
         if (this.client) {
             return this.client;
         }
-        this.client =
-            this.overrides?.clientFactory?.() ??
-                (0, client_1.createClient)(this.buildClientConfig());
-        const pingResult = await this.safePing(this.client);
-        if (pingResult && "success" in pingResult && pingResult.success === false) {
-            throw pingResult.error ?? new Error("ClickHouse ping failed");
+        this.client = this.overrides?.clientFactory?.() ?? (0, client_1.createClient)(this.buildClientConfig());
+        const pingResult = await this.client.ping();
+        if ('success' in pingResult && pingResult.success === false) {
+            throw pingResult.error ?? new Error('ClickHouse ping failed');
         }
         return this.client;
     }
-    async safePing(client) {
-        try {
-            return await client.ping();
-        }
-        catch (error) {
-            await client.close();
-            this.client = null;
-            throw error;
-        }
-    }
     buildClientConfig() {
         const merged = {
-            ...(this.config.clientOptions ?? {}),
+            ...this.config.clientOptions,
         };
         if (this.config.url) {
             merged.url = this.config.url;
         }
         else if (this.config.host) {
-            const protocol = this.config.protocol ?? "https";
-            const port = this.config.port ?? (protocol === "https" ? 8443 : 8123);
+            const protocol = this.config.protocol ?? 'https';
+            const port = this.config.port ?? (protocol === 'https' ? 8443 : 8123);
             merged.url = `${protocol}://${this.config.host}:${port}`;
         }
         merged.database = this.config.database;
@@ -201,7 +188,7 @@ function normalizeTableFilter(tables) {
         const trimmed = table.trim();
         if (!trimmed)
             continue;
-        const parts = trimmed.split(".");
+        const parts = trimmed.split('.');
         const tableName = parts[parts.length - 1];
         if (!tableName || seen.has(tableName))
             continue;
@@ -224,6 +211,7 @@ function transformColumnRow(row) {
         isPrimaryKey: Boolean(toNumber(row.is_in_primary_key)),
         isForeignKey: false,
     };
+    // Always safe to set defined optional string properties
     column.rawType = row.type;
     const defaultKind = sanitize(row.default_kind);
     if (defaultKind !== undefined)
@@ -258,9 +246,9 @@ function transformColumnRow(row) {
 function toNumber(value) {
     if (value === null || value === undefined)
         return undefined;
-    if (typeof value === "number")
+    if (typeof value === 'number')
         return value;
-    const parsed = Number.parseFloat(String(value));
+    const parsed = Number.parseFloat(value);
     return Number.isNaN(parsed) ? undefined : parsed;
 }
 function sanitize(value) {
@@ -270,23 +258,13 @@ function sanitize(value) {
     return trimmed.length ? trimmed : undefined;
 }
 function asTableType(isView) {
-    if (typeof isView === "number") {
-        return isView > 0 ? "view" : "table";
+    if (typeof isView === 'number') {
+        return isView > 0 ? 'view' : 'table';
     }
-    if (typeof isView === "string") {
+    if (typeof isView === 'string') {
         const normalized = isView.toLowerCase();
-        return normalized === "1" || normalized === "true" ? "view" : "table";
+        return normalized === '1' || normalized === 'true' ? 'view' : 'table';
     }
-    return "table";
-}
-function buildTableStatistics(totalRows, totalBytes) {
-    if (totalRows === undefined && totalBytes === undefined)
-        return undefined;
-    const stats = {};
-    if (totalRows !== undefined)
-        stats.totalRows = totalRows;
-    if (totalBytes !== undefined)
-        stats.totalBytes = totalBytes;
-    return stats;
+    return 'table';
 }
 //# sourceMappingURL=clickhouse.js.map