@clickhouse/client 0.1.1 → 0.2.0

package/dist/connection/{adapter/base_http_adapter.js → node_base_connection.js}

@@ -1,96 +1,36 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseHttpAdapter = void 0;
+exports.NodeBaseConnection = void 0;
+const client_common_1 = require("@clickhouse/client-common");
+const crypto_1 = __importDefault(require("crypto"));
 const stream_1 = __importDefault(require("stream"));
 const zlib_1 = __importDefault(require("zlib"));
-const error_1 = require("../../error");
-const http_search_params_1 = require("./http_search_params");
-const transform_url_1 = require("./transform_url");
-const utils_1 = require("../../utils");
-const user_agent_1 = require("../../utils/user_agent");
-const uuid = __importStar(require("uuid"));
-function isSuccessfulResponse(statusCode) {
-    return Boolean(statusCode && 200 <= statusCode && statusCode < 300);
-}
-function withHttpSettings(clickhouse_settings, compression) {
-    return {
-        ...(compression
-            ? {
-                enable_http_compression: 1,
-            }
-            : {}),
-        ...clickhouse_settings,
-    };
-}
-function decompressResponse(response) {
-    const encoding = response.headers['content-encoding'];
-    if (encoding === 'gzip') {
-        return {
-            response: stream_1.default.pipeline(response, zlib_1.default.createGunzip(), function pipelineCb(err) {
-                if (err) {
-                    console.error(err);
-                }
-            }),
-        };
-    }
-    else if (encoding !== undefined) {
-        return {
-            error: new Error(`Unexpected encoding: ${encoding}`),
-        };
-    }
-    return { response };
-}
-function isDecompressionError(result) {
-    return result.error !== undefined;
-}
+const utils_1 = require("../utils");
 const expiredSocketMessage = 'expired socket';
-class BaseHttpAdapter {
-    constructor(config, logger, agent) {
-        Object.defineProperty(this, "config", {
+class NodeBaseConnection {
+    constructor(params, agent) {
+        Object.defineProperty(this, "params", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: config
+            value: params
         });
-        Object.defineProperty(this, "logger", {
+        Object.defineProperty(this, "agent", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: logger
+            value: agent
         });
-        Object.defineProperty(this, "agent", {
+        Object.defineProperty(this, "headers", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: agent
+            value: void 0
         });
-        Object.defineProperty(this, "headers", {
+        Object.defineProperty(this, "logger", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -108,15 +48,15 @@ class BaseHttpAdapter {
             writable: true,
             value: new WeakMap()
         });
-        this.headers = this.buildDefaultHeaders(config.username, config.password);
+        this.logger = params.logWriter;
         this.retry_expired_sockets =
-            this.config.keep_alive.enabled &&
-                this.config.keep_alive.retry_on_expired_socket;
+            params.keep_alive.enabled && params.keep_alive.retry_on_expired_socket;
+        this.headers = this.buildDefaultHeaders(params.username, params.password);
     }
     buildDefaultHeaders(username, password) {
         return {
             Authorization: `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`,
-            'User-Agent': (0, user_agent_1.getUserAgent)(this.config.application_id),
+            'User-Agent': (0, utils_1.getUserAgent)(this.params.application_id),
         };
     }
     async request(params, retryCount = 0) {
@@ -142,7 +82,7 @@ class BaseHttpAdapter {
     async _request(params) {
         return new Promise((resolve, reject) => {
             const start = Date.now();
-            const request = this.createClientRequest(params, params.abort_signal);
+            const request = this.createClientRequest(params);
             function onError(err) {
                 removeRequestListeners();
                 reject(err);
@@ -153,11 +93,11 @@ class BaseHttpAdapter {
                 if (isDecompressionError(decompressionResult)) {
                     return reject(decompressionResult.error);
                 }
-                if (isSuccessfulResponse(_response.statusCode)) {
+                if ((0, client_common_1.isSuccessfulResponse)(_response.statusCode)) {
                     return resolve(decompressionResult.response);
                 }
                 else {
-                    reject((0, error_1.parseError)(await (0, utils_1.getAsText)(decompressionResult.response)));
+                    reject((0, client_common_1.parseError)(await (0, utils_1.getAsText)(decompressionResult.response)));
                 }
             };
             function onAbort() {
@@ -170,7 +110,7 @@ class BaseHttpAdapter {
                      * see the full sequence of events https://nodejs.org/api/http.html#httprequesturl-options-callback
                      * */
                 });
-                reject(new Error('The request was aborted.'));
+                reject(new Error('The user aborted a request.'));
             }
             function onClose() {
                 // Adapter uses 'close' event to clean up listeners after the successful response.
@@ -211,7 +151,7 @@ class BaseHttpAdapter {
                         // if a socket was reused at an unfortunate time,
                         // and is likely about to expire
                         const isPossiblyExpired = Date.now() - socketInfo.last_used_time >
-                            this.config.keep_alive.socket_ttl;
+                            this.params.keep_alive.socket_ttl;
                         if (isPossiblyExpired) {
                             this.logger.trace({
                                 module: 'Connection',
@@ -235,7 +175,7 @@ class BaseHttpAdapter {
                         }
                     }
                     else {
-                        const socketId = uuid.v4();
+                        const socketId = crypto_1.default.randomUUID();
                         this.logger.trace({
                             module: 'Connection',
                             message: `Using a new socket ${socketId}`,
@@ -256,12 +196,12 @@ class BaseHttpAdapter {
                 // The socket won't be actually destroyed,
                 // and it will be returned to the pool.
                 // TODO: investigate if can actually remove the idle sockets properly
-                socket.setTimeout(this.config.request_timeout, onTimeout);
+                socket.setTimeout(this.params.request_timeout, onTimeout);
             };
             function onTimeout() {
                 removeRequestListeners();
                 request.destroy();
-                reject(new Error('Timeout error'));
+                reject(new Error('Timeout error.'));
             }
             function removeRequestListeners() {
                 if (request.socket !== null) {
@@ -288,19 +228,29 @@ class BaseHttpAdapter {
         });
     }
     async ping() {
-        // TODO add status code check
-        const stream = await this.request({
-            method: 'GET',
-            url: (0, transform_url_1.transformUrl)({ url: this.config.url, pathname: '/ping' }),
-        });
-        stream.destroy();
-        return true;
+        try {
+            const stream = await this.request({
+                method: 'GET',
+                url: (0, client_common_1.transformUrl)({ url: this.params.url, pathname: '/ping' }),
+            });
+            stream.destroy();
+            return { success: true };
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                return {
+                    success: false,
+                    error,
+                };
+            }
+            throw error; // should never happen
+        }
     }
     async query(params) {
-        const query_id = this.getQueryId(params);
-        const clickhouse_settings = withHttpSettings(params.clickhouse_settings, this.config.compression.decompress_response);
-        const searchParams = (0, http_search_params_1.toSearchParams)({
-            database: this.config.database,
+        const query_id = getQueryId(params.query_id);
+        const clickhouse_settings = (0, client_common_1.withHttpSettings)(params.clickhouse_settings, this.params.compression.decompress_response);
+        const searchParams = (0, client_common_1.toSearchParams)({
+            database: this.params.database,
             clickhouse_settings,
             query_params: params.query_params,
             session_id: params.session_id,
@@ -308,7 +258,7 @@ class BaseHttpAdapter {
         });
         const stream = await this.request({
             method: 'POST',
-            url: (0, transform_url_1.transformUrl)({ url: this.config.url, pathname: '/', searchParams }),
+            url: (0, client_common_1.transformUrl)({ url: this.params.url, pathname: '/', searchParams }),
             body: params.query,
             abort_signal: params.abort_signal,
             decompress_response: clickhouse_settings.enable_http_compression === 1,
@@ -319,9 +269,9 @@ class BaseHttpAdapter {
         };
     }
     async exec(params) {
-        const query_id = this.getQueryId(params);
-        const searchParams = (0, http_search_params_1.toSearchParams)({
-            database: this.config.database,
+        const query_id = getQueryId(params.query_id);
+        const searchParams = (0, client_common_1.toSearchParams)({
+            database: this.params.database,
             clickhouse_settings: params.clickhouse_settings,
             query_params: params.query_params,
             session_id: params.session_id,
@@ -329,7 +279,7 @@ class BaseHttpAdapter {
         });
         const stream = await this.request({
             method: 'POST',
-            url: (0, transform_url_1.transformUrl)({ url: this.config.url, pathname: '/', searchParams }),
+            url: (0, client_common_1.transformUrl)({ url: this.params.url, pathname: '/', searchParams }),
             body: params.query,
             abort_signal: params.abort_signal,
         });
@@ -339,9 +289,9 @@ class BaseHttpAdapter {
         };
     }
     async insert(params) {
-        const query_id = this.getQueryId(params);
-        const searchParams = (0, http_search_params_1.toSearchParams)({
-            database: this.config.database,
+        const query_id = getQueryId(params.query_id);
+        const searchParams = (0, client_common_1.toSearchParams)({
+            database: this.params.database,
             clickhouse_settings: params.clickhouse_settings,
             query_params: params.query_params,
             query: params.query,
@@ -350,10 +300,10 @@ class BaseHttpAdapter {
         });
         const stream = await this.request({
             method: 'POST',
-            url: (0, transform_url_1.transformUrl)({ url: this.config.url, pathname: '/', searchParams }),
+            url: (0, client_common_1.transformUrl)({ url: this.params.url, pathname: '/', searchParams }),
             body: params.values,
             abort_signal: params.abort_signal,
-            compress_request: this.config.compression.compress_request,
+            compress_request: this.params.compression.compress_request,
         });
         stream.destroy();
         return { query_id };
@@ -363,15 +313,12 @@ class BaseHttpAdapter {
             this.agent.destroy();
         }
     }
-    getQueryId(params) {
-        return params.query_id || uuid.v4();
-    }
     logResponse(request, params, response, startTimestamp) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { authorization, host, ...headers } = request.getHeaders();
         const duration = Date.now() - startTimestamp;
-        this.logger.debug({
-            module: 'Connection',
+        this.params.logWriter.debug({
+            module: 'HTTP Adapter',
             message: 'Got a response from ClickHouse',
             args: {
                 request_method: params.method,
@@ -384,13 +331,30 @@ class BaseHttpAdapter {
             },
         });
     }
-    getHeaders(params) {
+}
+exports.NodeBaseConnection = NodeBaseConnection;
+function decompressResponse(response) {
+    const encoding = response.headers['content-encoding'];
+    if (encoding === 'gzip') {
         return {
-            ...this.headers,
-            ...(params.decompress_response ? { 'Accept-Encoding': 'gzip' } : {}),
-            ...(params.compress_request ? { 'Content-Encoding': 'gzip' } : {}),
+            response: stream_1.default.pipeline(response, zlib_1.default.createGunzip(), function pipelineCb(err) {
+                if (err) {
+                    console.error(err);
+                }
+            }),
         };
     }
+    else if (encoding !== undefined) {
+        return {
+            error: new Error(`Unexpected encoding: ${encoding}`),
+        };
+    }
+    return { response };
+}
+function isDecompressionError(result) {
+    return result.error !== undefined;
+}
+function getQueryId(query_id) {
+    return query_id || crypto_1.default.randomUUID();
 }
-exports.BaseHttpAdapter = BaseHttpAdapter;
-//# sourceMappingURL=base_http_adapter.js.map
+//# sourceMappingURL=node_base_connection.js.map

package/dist/connection/node_base_connection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"node_base_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_base_connection.ts"],"names":[],"mappings":"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"}

package/dist/connection/node_http_connection.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import type { Connection } from '@clickhouse/client-common';
+import Http from 'http';
+import type Stream from 'stream';
+import type { NodeConnectionParams, RequestParams } from './node_base_connection';
+import { NodeBaseConnection } from './node_base_connection';
+export declare class NodeHttpConnection extends NodeBaseConnection implements Connection<Stream.Readable> {
+    constructor(params: NodeConnectionParams);
+    protected createClientRequest(params: RequestParams): Http.ClientRequest;
+}

package/dist/connection/node_http_connection.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeHttpConnection = void 0;
+const client_common_1 = require("@clickhouse/client-common");
+const http_1 = __importDefault(require("http"));
+const node_base_connection_1 = require("./node_base_connection");
+class NodeHttpConnection extends node_base_connection_1.NodeBaseConnection {
+    constructor(params) {
+        const agent = new http_1.default.Agent({
+            keepAlive: params.keep_alive.enabled,
+            maxSockets: params.max_open_connections,
+        });
+        super(params, agent);
+    }
+    createClientRequest(params) {
+        return http_1.default.request(params.url, {
+            method: params.method,
+            agent: this.agent,
+            headers: (0, client_common_1.withCompressionHeaders)({
+                headers: this.headers,
+                compress_request: params.compress_request,
+                decompress_response: params.decompress_response,
+            }),
+            signal: params.abort_signal,
+        });
+    }
+}
+exports.NodeHttpConnection = NodeHttpConnection;
+//# sourceMappingURL=node_http_connection.js.map

package/dist/connection/node_http_connection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"node_http_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_http_connection.ts"],"names":[],"mappings":";;;;;;AACA,6DAAkE;AAClE,gDAAuB;AAMvB,iEAA2D;AAE3D,MAAa,kBACX,SAAQ,yCAAkB;IAG1B,YAAY,MAA4B;QACtC,MAAM,KAAK,GAAG,IAAI,cAAI,CAAC,KAAK,CAAC;YAC3B,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO;YACpC,UAAU,EAAE,MAAM,CAAC,oBAAoB;SACxC,CAAC,CAAA;QACF,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC;IAES,mBAAmB,CAAC,MAAqB;QACjD,OAAO,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YAC9B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAA,sCAAsB,EAAC;gBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACzC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;aAChD,CAAC;YACF,MAAM,EAAE,MAAM,CAAC,YAAY;SAC5B,CAAC,CAAA;IACJ,CAAC;CACF;AAxBD,gDAwBC"}

package/dist/connection/node_https_connection.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import type { Connection } from '@clickhouse/client-common';
+import type Http from 'http';
+import type Stream from 'stream';
+import type { NodeConnectionParams, RequestParams } from './node_base_connection';
+import { NodeBaseConnection } from './node_base_connection';
+export declare class NodeHttpsConnection extends NodeBaseConnection implements Connection<Stream.Readable> {
+    constructor(params: NodeConnectionParams);
+    protected buildDefaultHeaders(username: string, password: string): Http.OutgoingHttpHeaders;
+    protected createClientRequest(params: RequestParams): Http.ClientRequest;
+}

package/dist/connection/node_https_connection.js

@@ -0,0 +1,53 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeHttpsConnection = void 0;
+const client_common_1 = require("@clickhouse/client-common");
+const https_1 = __importDefault(require("https"));
+const node_base_connection_1 = require("./node_base_connection");
+class NodeHttpsConnection extends node_base_connection_1.NodeBaseConnection {
+    constructor(params) {
+        var _a, _b, _c;
+        const agent = new https_1.default.Agent({
+            keepAlive: params.keep_alive.enabled,
+            maxSockets: params.max_open_connections,
+            ca: (_a = params.tls) === null || _a === void 0 ? void 0 : _a.ca_cert,
+            key: ((_b = params.tls) === null || _b === void 0 ? void 0 : _b.type) === 'Mutual' ? params.tls.key : undefined,
+            cert: ((_c = params.tls) === null || _c === void 0 ? void 0 : _c.type) === 'Mutual' ? params.tls.cert : undefined,
+        });
+        super(params, agent);
+    }
+    buildDefaultHeaders(username, password) {
+        var _a, _b;
+        if (((_a = this.params.tls) === null || _a === void 0 ? void 0 : _a.type) === 'Mutual') {
+            return {
+                'X-ClickHouse-User': username,
+                'X-ClickHouse-Key': password,
+                'X-ClickHouse-SSL-Certificate-Auth': 'on',
+            };
+        }
+        if (((_b = this.params.tls) === null || _b === void 0 ? void 0 : _b.type) === 'Basic') {
+            return {
+                'X-ClickHouse-User': username,
+                'X-ClickHouse-Key': password,
+            };
+        }
+        return super.buildDefaultHeaders(username, password);
+    }
+    createClientRequest(params) {
+        return https_1.default.request(params.url, {
+            method: params.method,
+            agent: this.agent,
+            headers: (0, client_common_1.withCompressionHeaders)({
+                headers: this.headers,
+                compress_request: params.compress_request,
+                decompress_response: params.decompress_response,
+            }),
+            signal: params.abort_signal,
+        });
+    }
+}
+exports.NodeHttpsConnection = NodeHttpsConnection;
+//# sourceMappingURL=node_https_connection.js.map

package/dist/connection/node_https_connection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"node_https_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_https_connection.ts"],"names":[],"mappings":";;;;;;AACA,6DAAkE;AAElE,kDAAyB;AAMzB,iEAA2D;AAE3D,MAAa,mBACX,SAAQ,yCAAkB;IAG1B,YAAY,MAA4B;;QACtC,MAAM,KAAK,GAAG,IAAI,eAAK,CAAC,KAAK,CAAC;YAC5B,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO;YACpC,UAAU,EAAE,MAAM,CAAC,oBAAoB;YACvC,EAAE,EAAE,MAAA,MAAM,CAAC,GAAG,0CAAE,OAAO;YACvB,GAAG,EAAE,CAAA,MAAA,MAAM,CAAC,GAAG,0CAAE,IAAI,MAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YAC/D,IAAI,EAAE,CAAA,MAAA,MAAM,CAAC,GAAG,0CAAE,IAAI,MAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;SAClE,CAAC,CAAA;QACF,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC;IAEkB,mBAAmB,CACpC,QAAgB,EAChB,QAAgB;;QAEhB,IAAI,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,0CAAE,IAAI,MAAK,QAAQ,EAAE;YACtC,OAAO;gBACL,mBAAmB,EAAE,QAAQ;gBAC7B,kBAAkB,EAAE,QAAQ;gBAC5B,mCAAmC,EAAE,IAAI;aAC1C,CAAA;SACF;QACD,IAAI,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,0CAAE,IAAI,MAAK,OAAO,EAAE;YACrC,OAAO;gBACL,mBAAmB,EAAE,QAAQ;gBAC7B,kBAAkB,EAAE,QAAQ;aAC7B,CAAA;SACF;QACD,OAAO,KAAK,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACtD,CAAC;IAES,mBAAmB,CAAC,MAAqB;QACjD,OAAO,eAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YAC/B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAA,sCAAsB,EAAC;gBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACzC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;aAChD,CAAC;YACF,MAAM,EAAE,MAAM,CAAC,YAAY;SAC5B,CAAC,CAAA;IACJ,CAAC;CACF;AA/CD,kDA+CC"}

package/dist/index.d.ts

@@ -1,15 +1,4 @@
-import { createClient } from './client';
-export { createClient };
-declare const _default: {
-    createClient: typeof createClient;
-};
-export default _default;
-export { type ClickHouseClientConfigOptions, type ClickHouseClient, type BaseParams, type QueryParams, type ExecParams, type InsertParams, type CommandParams, type CommandResult, } from './client';
-export { Row, ResultSet } from './result';
-export type { Connection, ExecResult, InsertResult } from './connection';
-export type { DataFormat } from './data_formatter';
-export type { ClickHouseError } from './error';
-export type { Logger } from './logger';
-export type { ResponseJSON, InputJSON, InputJSONObjectEachRow, } from './clickhouse_types';
-export type { ClickHouseSettings } from './settings';
-export { SettingsMap } from './settings';
+export { createConnection, createClient } from './client';
+export { ResultSet } from './result_set';
+/** Re-export @clickhouse/client-common types */
+export { type BaseClickHouseClientConfigOptions, type ClickHouseClientConfigOptions, type BaseQueryParams, type QueryParams, type ExecParams, type InsertParams, type InsertValues, type CommandParams, type CommandResult, type ExecResult, type InsertResult, type DataFormat, type ErrorLogParams, type Logger, type LogParams, type ClickHouseSettings, type MergeTreeSettings, type Row, type ResponseJSON, type InputJSON, type InputJSONObjectEachRow, type BaseResultSet, type PingResult, ClickHouseError, ClickHouseLogLevel, ClickHouseClient, SettingsMap, } from '@clickhouse/client-common';

package/dist/index.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SettingsMap = exports.ResultSet = exports.createClient = void 0;
-const client_1 = require("./client");
+exports.SettingsMap = exports.ClickHouseClient = exports.ClickHouseLogLevel = exports.ClickHouseError = exports.ResultSet = exports.createClient = exports.createConnection = void 0;
+var client_1 = require("./client");
+Object.defineProperty(exports, "createConnection", { enumerable: true, get: function () { return client_1.createConnection; } });
 Object.defineProperty(exports, "createClient", { enumerable: true, get: function () { return client_1.createClient; } });
-exports.default = {
-    createClient: client_1.createClient,
-};
-var result_1 = require("./result");
-Object.defineProperty(exports, "ResultSet", { enumerable: true, get: function () { return result_1.ResultSet; } });
-var settings_1 = require("./settings");
-Object.defineProperty(exports, "SettingsMap", { enumerable: true, get: function () { return settings_1.SettingsMap; } });
+var result_set_1 = require("./result_set");
+Object.defineProperty(exports, "ResultSet", { enumerable: true, get: function () { return result_set_1.ResultSet; } });
+/** Re-export @clickhouse/client-common types */
+var client_common_1 = require("@clickhouse/client-common");
+Object.defineProperty(exports, "ClickHouseError", { enumerable: true, get: function () { return client_common_1.ClickHouseError; } });
+Object.defineProperty(exports, "ClickHouseLogLevel", { enumerable: true, get: function () { return client_common_1.ClickHouseLogLevel; } });
+Object.defineProperty(exports, "ClickHouseClient", { enumerable: true, get: function () { return client_common_1.ClickHouseClient; } });
+Object.defineProperty(exports, "SettingsMap", { enumerable: true, get: function () { return client_common_1.SettingsMap; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAE9B,6FAFA,qBAAY,OAEA;AACrB,kBAAe;IACb,YAAY,EAAZ,qBAAY;CACb,CAAA;AAaD,mCAAyC;AAA3B,mGAAA,SAAS,OAAA;AAavB,uCAAwC;AAA/B,uGAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/client-node/src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAyD;AAAhD,0GAAA,gBAAgB,OAAA;AAAE,sGAAA,YAAY,OAAA;AACvC,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAElB,gDAAgD;AAChD,2DA4BkC;AAJhC,gHAAA,eAAe,OAAA;AACf,mHAAA,kBAAkB,OAAA;AAClB,iHAAA,gBAAgB,OAAA;AAChB,4GAAA,WAAW,OAAA"}

package/dist/result_set.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="node" />
+import type { BaseResultSet, DataFormat } from '@clickhouse/client-common';
+import Stream from 'stream';
+export declare class ResultSet implements BaseResultSet<Stream.Readable> {
+    private _stream;
+    private readonly format;
+    readonly query_id: string;
+    constructor(_stream: Stream.Readable, format: DataFormat, query_id: string);
+    text(): Promise<string>;
+    json<T>(): Promise<T>;
+    stream(): Stream.Readable;
+    close(): void;
+}

package/dist/{result.js → result_set.js}

@@ -24,9 +24,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResultSet = void 0;
+const client_common_1 = require("@clickhouse/client-common");
 const stream_1 = __importStar(require("stream"));
 const utils_1 = require("./utils");
-const data_formatter_1 = require("./data_formatter");
 class ResultSet {
     constructor(_stream, format, query_id) {
         Object.defineProperty(this, "_stream", {
@@ -48,45 +48,18 @@ class ResultSet {
             value: query_id
         });
     }
-    /**
-     * The method waits for all the rows to be fully loaded
-     * and returns the result as a string.
-     *
-     * The method will throw if the underlying stream was already consumed
-     * by calling the other methods.
-     */
     async text() {
         if (this._stream.readableEnded) {
             throw Error(streamAlreadyConsumedMessage);
         }
         return (await (0, utils_1.getAsText)(this._stream)).toString();
     }
-    /**
-     * The method waits for the all the rows to be fully loaded.
-     * When the response is received in full, it will be decoded to return JSON.
-     *
-     * The method will throw if the underlying stream was already consumed
-     * by calling the other methods.
-     */
     async json() {
         if (this._stream.readableEnded) {
             throw Error(streamAlreadyConsumedMessage);
         }
-        return (0, data_formatter_1.decode)(await this.text(), this.format);
+        return (0, client_common_1.decode)(await this.text(), this.format);
     }
-    /**
-     * Returns a readable stream for responses that can be streamed
-     * (i.e. all except JSON).
-     *
-     * Every iteration provides an array of {@link Row} instances
-     * for {@link StreamableDataFormat} format.
-     *
-     * Should be called only once.
-     *
-     * The method will throw if called on a response in non-streamable format,
-     * and if the underlying stream was already consumed
-     * by calling the other methods.
-     */
     stream() {
         // If the underlying stream has already ended by calling `text` or `json`,
         // Stream.pipeline will create a new empty stream
@@ -94,7 +67,7 @@ class ResultSet {
         if (this._stream.readableEnded) {
             throw Error(streamAlreadyConsumedMessage);
         }
-        (0, data_formatter_1.validateStreamFormat)(this.format);
+        (0, client_common_1.validateStreamFormat)(this.format);
         let decodedChunk = '';
         const toRows = new stream_1.Transform({
             transform(chunk, encoding, callback) {
@@ -109,7 +82,7 @@ class ResultSet {
                         rows.push({
                             text,
                             json() {
-                                return (0, data_formatter_1.decode)(text, 'JSON');
+                                return (0, client_common_1.decode)(text, 'JSON');
                             },
                         });
                     }
@@ -137,4 +110,4 @@ class ResultSet {
 }
 exports.ResultSet = ResultSet;
 const streamAlreadyConsumedMessage = 'Stream has been already consumed';
-//# sourceMappingURL=result.js.map
+//# sourceMappingURL=result_set.js.map

package/dist/result_set.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"result_set.js","sourceRoot":"","sources":["../../../packages/client-node/src/result_set.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6DAAwE;AAExE,iDAA0C;AAC1C,mCAAmC;AAEnC,MAAa,SAAS;IACpB,YACU,OAAwB,EACf,MAAkB,EACnB,QAAgB;;;;;mBAFxB;;;;;;mBACS;;;;;;mBACD;;IACf,CAAC;IAEJ,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;YAC9B,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAA;SAC1C;QACD,OAAO,CAAC,MAAM,IAAA,iBAAS,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IACnD,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;YAC9B,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAA;SAC1C;QACD,OAAO,IAAA,sBAAM,EAAC,MAAM,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAC/C,CAAC;IAED,MAAM;QACJ,0EAA0E;QAC1E,iDAAiD;QACjD,+CAA+C;QAC/C,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;YAC9B,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAA;SAC1C;QAED,IAAA,oCAAoB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjC,IAAI,YAAY,GAAG,EAAE,CAAA;QACrB,MAAM,MAAM,GAAG,IAAI,kBAAS,CAAC;YAC3B,SAAS,CACP,KAAa,EACb,QAAwB,EACxB,QAA2B;gBAE3B,YAAY,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAA;gBAChC,MAAM,IAAI,GAAU,EAAE,CAAA;gBACtB,iDAAiD;gBACjD,OAAO,IAAI,EAAE;oBACX,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;oBACtC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE;wBACd,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;wBACvC,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAA;wBAC1C,IAAI,CAAC,IAAI,CAAC;4BACR,IAAI;4BACJ,IAAI;gCACF,OAAO,IAAA,sBAAM,EAAC,IAAI,EAAE,MAAM,CAAC,CAAA;4BAC7B,CAAC;yBACF,CAAC,CAAA;qBACH;yBAAM;wBACL,IAAI,IAAI,CAAC,MAAM,EAAE;4BACf,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;yBAChB;wBACD,MAAK;qBACN;iBACF;gBACD,QAAQ,EAAE,CAAA;YACZ,CAAC;YACD,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAA;QAEF,OAAO,gBAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,UAAU,CAAC,GAAG;YAClE,IAAI,GAAG,EAAE;gBACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACnB;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;IACxB,CAAC;CACF;AA3ED,8BA2EC;AAED,MAAM,4BAA4B,GAAG,kCAAkC,CAAA"}