@clickhouse/client 1.18.0 → 1.18.2-head.084b623.1

package/dist/connection/stream.d.ts

@@ -1,6 +1,6 @@
 import { type LogWriter, type ConnOperation, ClickHouseLogLevel } from '@clickhouse/client-common';
 import type Stream from 'stream';
-interface Context {
+export interface Context {
     op: ConnOperation;
     log_level: ClickHouseLogLevel;
     log_writer: LogWriter;
@@ -8,6 +8,12 @@ interface Context {
 }
 /** Drains the response stream, as calling `destroy` on a {@link Stream.Readable} response stream
  *  will result in closing the underlying socket, and negate the KeepAlive feature benefits.
+ *  See https://github.com/ClickHouse/clickhouse-js/pull/203
+ *  @deprecated This method is not intended to be used outside of the client implementation anymore. Use `client.command()` instead, which will handle draining the stream internally when needed.
+ * */
+export declare function drainStream(stream: Stream.Readable): Promise<void>;
+/** Drains the response stream, as calling `destroy` on a {@link Stream.Readable} response stream
+ *  will result in closing the underlying socket, and negate the KeepAlive feature benefits.
+ * Also, provides additional internal logging for debugging stream issues. Not intended to be used outside of the client implementation.
  *  See https://github.com/ClickHouse/clickhouse-js/pull/203 */
-export declare function drainStream(ctx: Context, stream: Stream.Readable): Promise<void>;
-export {};
+export declare function drainStreamInternal(ctx: Context, stream: Stream.Readable): Promise<void>;

package/dist/connection/stream.js

@@ -1,11 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drainStream = drainStream;
+exports.drainStreamInternal = drainStreamInternal;
 const client_common_1 = require("@clickhouse/client-common");
 /** Drains the response stream, as calling `destroy` on a {@link Stream.Readable} response stream
  *  will result in closing the underlying socket, and negate the KeepAlive feature benefits.
+ *  See https://github.com/ClickHouse/clickhouse-js/pull/203
+ *  @deprecated This method is not intended to be used outside of the client implementation anymore. Use `client.command()` instead, which will handle draining the stream internally when needed.
+ * */
+async function drainStream(stream) {
+    return new Promise((resolve, reject) => {
+        // If the stream has already emitted an error, we can reject the promise immediately.
+        if (stream.errored) {
+            // the stream is already errored, no need to attach listeners
+            reject(stream.errored);
+            return;
+        }
+        // Avoid a race condition where the stream has already sent the 'end' event before we attach the listener.
+        // In this case, we can resolve the promise immediately without attaching any listeners.
+        if (stream.readableEnded) {
+            // the stream is already ended, no need to attach listeners
+            resolve();
+            return;
+        }
+        // If the stream is already closed, we can resolve the promise immediately as well.
+        if (stream.closed) {
+            // the stream is already closed, no need to attach listeners
+            resolve();
+            return;
+        }
+        function dropData() {
+            // used only for the methods without expected response; we don't care about the data here
+        }
+        function onEnd() {
+            removeListeners();
+            resolve();
+        }
+        function onError(err) {
+            removeListeners();
+            reject(err);
+        }
+        function onClose() {
+            removeListeners();
+            // The `end` event might not be emitted if the server closes the connection.
+            // Making sure to resolve the promise in this case as well.
+            resolve();
+        }
+        function removeListeners() {
+            stream.removeListener('data', dropData);
+            stream.removeListener('end', onEnd);
+            stream.removeListener('error', onError);
+            stream.removeListener('close', onClose);
+        }
+        stream.on('data', dropData);
+        stream.on('end', onEnd);
+        stream.on('error', onError);
+        stream.on('close', onClose);
+    });
+}
+/** Drains the response stream, as calling `destroy` on a {@link Stream.Readable} response stream
+ *  will result in closing the underlying socket, and negate the KeepAlive feature benefits.
+ * Also, provides additional internal logging for debugging stream issues. Not intended to be used outside of the client implementation.
  *  See https://github.com/ClickHouse/clickhouse-js/pull/203 */
-async function drainStream(ctx, stream) {
+async function drainStreamInternal(ctx, stream) {
     return new Promise((resolve, reject) => {
         const startTime = Date.now();
         let bytesReceived = 0;
@@ -23,6 +80,55 @@ async function drainStream(ctx, stream) {
                 },
             });
         }
+        // If the stream has already emitted an error, we can reject the promise immediately.
+        if (stream.errored) {
+            if (ctx.log_level <= client_common_1.ClickHouseLogLevel.TRACE) {
+                ctx.log_writer.trace({
+                    message: `${ctx.op}: stream already errored before drain`,
+                    args: {
+                        query_id: ctx.query_id,
+                        chunk_number: chunkCount,
+                        total_bytes_received: bytesReceived,
+                    },
+                });
+            }
+            // the stream is already errored, no need to attach listeners
+            reject(stream.errored);
+            return;
+        }
+        // Avoid a race condition where the stream has already sent the 'end' event before we attach the listener.
+        // In this case, we can resolve the promise immediately without attaching any listeners.
+        if (stream.readableEnded) {
+            if (ctx.log_level <= client_common_1.ClickHouseLogLevel.TRACE) {
+                ctx.log_writer.trace({
+                    message: `${ctx.op}: stream already ended before drain`,
+                    args: {
+                        query_id: ctx.query_id,
+                        chunk_number: chunkCount,
+                        total_bytes_received: bytesReceived,
+                    },
+                });
+            }
+            // the stream is already ended, no need to attach listeners
+            resolve();
+            return;
+        }
+        // If the stream is already closed, we can resolve the promise immediately as well.
+        if (stream.closed) {
+            if (ctx.log_level <= client_common_1.ClickHouseLogLevel.TRACE) {
+                ctx.log_writer.trace({
+                    message: `${ctx.op}: stream already closed before drain`,
+                    args: {
+                        query_id: ctx.query_id,
+                        chunk_number: chunkCount,
+                        total_bytes_received: bytesReceived,
+                    },
+                });
+            }
+            // the stream is already closed, no need to attach listeners
+            resolve();
+            return;
+        }
         function dropData(chunk) {
             // used only for the methods without expected response; we don't care about the data here
             if (ctx.log_level <= client_common_1.ClickHouseLogLevel.TRACE) {
@@ -87,6 +193,9 @@ async function drainStream(ctx, stream) {
                     },
                 });
             }
+            // The `end` event might not be emitted if the server closes the connection.
+            // Making sure to resolve the promise in this case as well.
+            resolve();
         }
         function removeListeners() {
             stream.removeListener('data', dropData);

package/dist/connection/stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/connection/stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/connection/stream.ts"],"names":[],"mappings":";;AAmBA,kCAyDC;AAMD,kDA+JC;AAjPD,6DAIkC;AAUlC;;;;KAIK;AACE,KAAK,UAAU,WAAW,CAAC,MAAuB;IACvD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,qFAAqF;QACrF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,6DAA6D;YAC7D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACtB,OAAM;QACR,CAAC;QAED,0GAA0G;QAC1G,wFAAwF;QACxF,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,2DAA2D;YAC3D,OAAO,EAAE,CAAA;YACT,OAAM;QACR,CAAC;QAED,mFAAmF;QACnF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,4DAA4D;YAC5D,OAAO,EAAE,CAAA;YACT,OAAM;QACR,CAAC;QAED,SAAS,QAAQ;YACf,yFAAyF;QAC3F,CAAC;QAED,SAAS,KAAK;YACZ,eAAe,EAAE,CAAA;YACjB,OAAO,EAAE,CAAA;QACX,CAAC;QAED,SAAS,OAAO,CAAC,GAAU;YACzB,eAAe,EAAE,CAAA;YACjB,MAAM,CAAC,GAAG,CAAC,CAAA;QACb,CAAC;QAED,SAAS,OAAO;YACd,eAAe,EAAE,CAAA;YACjB,4EAA4E;YAC5E,2DAA2D;YAC3D,OAAO,EAAE,CAAA;QACX,CAAC;QAED,SAAS,eAAe;YACtB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;YACvC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;YACnC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACvC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACzC,CAAC;QAED,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC3B,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QACvB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC3B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;+DAG+D;AACxD,KAAK,UAAU,mBAAmB,CACvC,GAAY,EACZ,MAAuB;IAEvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC5B,IAAI,aAAa,GAAG,CAAC,CAAA;QACrB,IAAI,UAAU,GAAG,CAAC,CAAA;QAElB,IAAI,GAAG,CAAC,SAAS,IAAI,kCAAkB,CAAC,KAAK,EAAE,CAAC;YAC9C,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;gBACnB,OAAO,EAAE,GAAG,GAAG,CAAC,EAAE,yBAAyB;gBAC3C,IAAI,EAAE;oBACJ,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,YAAY,EAAE;wBACZ,QAAQ,EAAE,MAAM,CAAC,QAAQ;wBACzB,aAAa,EAAE,MAAM,CAAC,aAAa;wBACnC,cAAc,EAAE,MAAM,CAAC,cAAc;qBACtC;iBACF;aACF,CAAC,CAAA;QACJ,CAAC;QAED,qFAAqF;QACrF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,GAAG,CAAC,SAAS,IAAI,kCAAkB,CAAC,KAAK,EAAE,CAAC;gBAC9C,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;oBACnB,OAAO,EAAE,GAAG,GAAG,CAAC,EAAE,uCAAuC;oBACzD,IAAI,EAAE;wBACJ,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,YAAY,EAAE,UAAU;wBACxB,oBAAoB,EAAE,aAAa;qBACpC;iBACF,CAAC,CAAA;YACJ,CAAC;YACD,6DAA6D;YAC7D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACtB,OAAM;QACR,CAAC;QAED,0GAA0G;QAC1G,wFAAwF;QACxF,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,IAAI,GAAG,CAAC,SAAS,IAAI,kCAAkB,CAAC,KAAK,EAAE,CAAC;gBAC9C,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;oBACnB,OAAO,EAAE,GAAG,GAAG,CAAC,EAAE,qCAAqC;oBACvD,IAAI,EAAE;wBACJ,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,YAAY,EAAE,UAAU;wBACxB,oBAAoB,EAAE,aAAa;qBACpC;iBACF,CAAC,CAAA;YACJ,CAAC;YACD,2DAA2D;YAC3D,OAAO,EAAE,CAAA;YACT,OAAM;QACR,CAAC;QAED,mFAAmF;QACnF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,GAAG,CAAC,SAAS,IAAI,kCAAkB,CAAC,KAAK,EAAE,CAAC;gBAC9C,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;oBACnB,OAAO,EAAE,GAAG,GAAG,CAAC,EAAE,sCAAsC;oBACxD,IAAI,EAAE;wBACJ,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,YAAY,EAAE,UAAU;wBACxB,oBAAoB,EAAE,aAAa;qBACpC;iBACF,CAAC,CAAA;YACJ,CAAC;YACD,4DAA4D;YAC5D,OAAO,EAAE,CAAA;YACT,OAAM;QACR,CAAC;QAED,SAAS,QAAQ,CAAC,KAAsB;YACtC,yFAAyF;YACzF,IAAI,GAAG,CAAC,SAAS,IAAI,kCAAkB,CAAC,KAAK,EAAE,CAAC;gBAC9C,UAAU,EAAE,CAAA;gBACZ,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;gBAC3C,aAAa,IAAI,UAAU,CAAA;gBAC3B,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;oBACnB,OAAO,EAAE,GAAG,GAAG,CAAC,EAAE,oCAAoC;oBACtD,IAAI,EAAE;wBACJ,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,YAAY,EAAE,UAAU;wBACxB,UAAU;wBACV,oBAAoB,EAAE,aAAa;qBACpC;iBACF,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAED,SAAS,KAAK;YACZ,eAAe,EAAE,CAAA;YACjB,IAAI,GAAG,CAAC,SAAS,IAAI,kCAAkB,CAAC,KAAK,EAAE,CAAC;gBAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAA;gBACvC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;oBACnB,OAAO,EAAE,GAAG,GAAG,CAAC,EAAE,sCAAsC;oBACxD,IAAI,EAAE;wBACJ,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,WAAW,EAAE,QAAQ;wBACrB,oBAAoB,EAAE,aAAa;wBACnC,YAAY,EAAE,UAAU;qBACzB;iBACF,CAAC,CAAA;YACJ,CAAC;YACD,OAAO,EAAE,CAAA;QACX,CAAC;QAED,SAAS,OAAO,CAAC,GAAU;YACzB,eAAe,EAAE,CAAA;YACjB,IAAI,GAAG,CAAC,SAAS,IAAI,kCAAkB,CAAC,KAAK,EAAE,CAAC;gBAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAA;gBACvC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;oBACnB,OAAO,EAAE,GAAG,GAAG,CAAC,EAAE,qCAAqC;oBACvD,IAAI,EAAE;wBACJ,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,WAAW,EAAE,QAAQ;wBACrB,oBAAoB,EAAE,aAAa;wBACnC,YAAY,EAAE,UAAU;wBACxB,KAAK,EAAE,GAAG,CAAC,OAAO;qBACnB;iBACF,CAAC,CAAA;YACJ,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,CAAA;QACb,CAAC;QAED,SAAS,OAAO;YACd,eAAe,EAAE,CAAA;YACjB,IAAI,GAAG,CAAC,SAAS,IAAI,kCAAkB,CAAC,KAAK,EAAE,CAAC;gBAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAA;gBACvC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;oBACnB,OAAO,EAAE,GAAG,GAAG,CAAC,EAAE,4CAA4C;oBAC9D,IAAI,EAAE;wBACJ,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,WAAW,EAAE,QAAQ;wBACrB,oBAAoB,EAAE,aAAa;wBACnC,YAAY,EAAE,UAAU;qBACzB;iBACF,CAAC,CAAA;YACJ,CAAC;YACD,4EAA4E;YAC5E,2DAA2D;YAC3D,OAAO,EAAE,CAAA;QACX,CAAC;QAED,SAAS,eAAe;YACtB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;YACvC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;YACnC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACvC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACzC,CAAC;QAED,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC3B,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QACvB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC3B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/dist/utils/stream.js

@@ -18,22 +18,23 @@ function isStream(obj) {
         typeof obj.on === 'function');
 }
 async function getAsText(stream) {
-    let text = '';
-    const textDecoder = new TextDecoder();
-    for await (const chunk of stream) {
-        const decoded = textDecoder.decode(chunk, { stream: true });
-        if (decoded.length + text.length > MAX_STRING_LENGTH) {
-            throw new Error('The response length exceeds the maximum allowed size of V8 String: ' +
-                `${MAX_STRING_LENGTH}; consider limiting the amount of requested rows.`);
+    try {
+        let text = '';
+        const textDecoder = new TextDecoder();
+        for await (const chunk of stream) {
+            text += textDecoder.decode(chunk, { stream: true });
         }
-        text += decoded;
+        // flush unfinished multi-byte characters
+        text += textDecoder.decode();
+        return text;
     }
-    // flush
-    const last = textDecoder.decode();
-    if (last) {
-        text += last;
+    catch (err) {
+        if (err instanceof RangeError &&
+            err.message.includes('Invalid string length')) {
+            throw new Error(`The response length exceeds the maximum allowed size of V8 String: ${MAX_STRING_LENGTH} characters.`);
+        }
+        throw err;
     }
-    return text;
 }
 function mapStream(mapper) {
     return new stream_1.default.Transform({

package/dist/utils/stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/utils/stream.ts"],"names":[],"mappings":";;;;;AAKA,4BASC;AAED,8BAsBC;AAED,8BASC;AAjDD,oDAA2B;AAC3B,mCAAkC;AAElC,MAAM,EAAE,iBAAiB,EAAE,GAAG,kBAAS,CAAA;AAEvC,SAAgB,QAAQ,CAAC,GAAY;IACnC,OAAO,CACL,OAAO,GAAG,KAAK,QAAQ;QACvB,GAAG,KAAK,IAAI;QACZ,MAAM,IAAI,GAAG;QACb,OAAO,GAAG,CAAC,IAAI,KAAK,UAAU;QAC9B,IAAI,IAAI,GAAG;QACX,OAAO,GAAG,CAAC,EAAE,KAAK,UAAU,CAC7B,CAAA;AACH,CAAC;AAEM,KAAK,UAAU,SAAS,CAAC,MAAuB;IACrD,IAAI,IAAI,GAAG,EAAE,CAAA;IAEb,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAA;IACrC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3D,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CACb,qEAAqE;gBACnE,GAAG,iBAAiB,mDAAmD,CAC1E,CAAA;QACH,CAAC;QACD,IAAI,IAAI,OAAO,CAAA;IACjB,CAAC;IAED,QAAQ;IACR,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,CAAA;IACjC,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,IAAI,IAAI,CAAA;IACd,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAgB,SAAS,CACvB,MAAkC;IAElC,OAAO,IAAI,gBAAM,CAAC,SAAS,CAAC;QAC1B,UAAU,EAAE,IAAI;QAChB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;YACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QAC/B,CAAC;KACF,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/utils/stream.ts"],"names":[],"mappings":";;;;;AAKA,4BASC;AAED,8BAwBC;AAED,8BASC;AAnDD,oDAA2B;AAC3B,mCAAkC;AAElC,MAAM,EAAE,iBAAiB,EAAE,GAAG,kBAAS,CAAA;AAEvC,SAAgB,QAAQ,CAAC,GAAY;IACnC,OAAO,CACL,OAAO,GAAG,KAAK,QAAQ;QACvB,GAAG,KAAK,IAAI;QACZ,MAAM,IAAI,GAAG;QACb,OAAO,GAAG,CAAC,IAAI,KAAK,UAAU;QAC9B,IAAI,IAAI,GAAG;QACX,OAAO,GAAG,CAAC,EAAE,KAAK,UAAU,CAC7B,CAAA;AACH,CAAC;AAEM,KAAK,UAAU,SAAS,CAAC,MAAuB;IACrD,IAAI,CAAC;QACH,IAAI,IAAI,GAAG,EAAE,CAAA;QAEb,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAA;QACrC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACjC,IAAI,IAAI,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QACrD,CAAC;QAED,yCAAyC;QACzC,IAAI,IAAI,WAAW,CAAC,MAAM,EAAE,CAAA;QAE5B,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IACE,GAAG,YAAY,UAAU;YACzB,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAC7C,CAAC;YACD,MAAM,IAAI,KAAK,CACb,sEAAsE,iBAAiB,cAAc,CACtG,CAAA;QACH,CAAC;QACD,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC;AAED,SAAgB,SAAS,CACvB,MAAkC;IAElC,OAAO,IAAI,gBAAM,CAAC,SAAS,CAAC;QAC1B,UAAU,EAAE,IAAI;QAChB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;YACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QAC/B,CAAC;KACF,CAAC,CAAA;AACJ,CAAC"}

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "1.18.0";
+declare const _default: "1.18.2-head.084b623.1";
 export default _default;

package/dist/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '1.18.0';
+exports.default = '1.18.2-head.084b623.1';
 //# sourceMappingURL=version.js.map

package/dist/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;AAAA,kBAAe,QAAQ,CAAA"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;AAAA,kBAAe,uBAAuB,CAAA"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@clickhouse/client",
   "description": "Official JS client for ClickHouse DB - Node.js implementation",
   "homepage": "https://clickhouse.com",
-  "version": "1.18.0",
+  "version": "1.18.2-head.084b623.1",
   "license": "Apache-2.0",
   "keywords": [
     "clickhouse",
@@ -25,12 +25,12 @@
   "scripts": {
     "prepack": "cp ../../README.md ../../LICENSE .",
     "typecheck": "tsc --noEmit",
-    "lint": "eslint .",
+    "lint": "eslint --max-warnings=0 .",
     "lint:fix": "eslint . --fix",
     "build": "rm -rf dist; tsc"
   },
   "dependencies": {
-    "@clickhouse/client-common": "1.18.0"
+    "@clickhouse/client-common": "1.18.2-head.084b623.1"
   },
   "devDependencies": {
     "simdjson": "^0.9.2"