@m2k-5f/pgtx 2.7.3 → 2.8.1

package/README.md

@@ -50,37 +50,48 @@ Benchmarks run on GitHub Actions (Ubuntu, 2 vCPUs), reproducible, sources in thi
  
 Bun.sql is Bun's own built-in driver, written in native code and generally treated as the speed baseline in that ecosystem. Pgtx stays ahead of it at every concurrency level tested — the gap doesn't come from JS-vs-native, it comes from the protocol implementation.
  
-**How:** everything you fire concurrently against the same connection gets folded into one pipelined write — Parse/Bind/Execute for every query in the batch goes out in a single `socket.write()`, and results get demuxed as they come back, in order, without buffering rows you haven't asked for yet. Prepared statements are cached and deduplicated automatically, row descriptions are cached alongside them, and the binary protocol skips text (de)serialization where it can. None of this requires you to change how you write queries.
+**How:** everything you fire concurrently against the same connection gets folded into one pipelined write — Parse/Bind/Execute for every query in the batch goes out in a single `socket.write()`, and results get demuxed as they come back, in order, without buffering rows you haven't asked for yet. Prepared statements are cached and deduplicated automatically, row descriptions are cached alongside them. None of this requires you to change how you write queries.
+
 
 ## The parts worth knowing about
 
 
-### Every query is its own commit boundary
+### Error handling
+
+Every query returns a `Future<T[], PostgresError>` instead of a bare `Promise`. `await` works as usual, while `Future` also provides typed error handling and recovery without a `try/catch` pyramid.
 
-Fire off several queries in the same batch and one of them fails — the others aren't affected. Each query gets its own Sync, which means its own implicit transaction: an error in query B doesn't undo query A, even if A already returned and B is still in flight on the same pipelined write.
+Queries in the same pipeline are isolated from each other. Each query gets its own `Sync`, so an error in one query does not affect other queries that were sent in the same batch.
 
 ```typescript
 const [a, b] = await Promise.allSettled([
   pool.execute`UPDATE accounts SET balance = balance + 100 WHERE id = ${1}`,
   pool.execute`INSERT INTO accounts (id) VALUES (${1})` // duplicate key, fails
 ])
-// a: fulfilled, the balance update is committed regardless of b's outcome
-```
 
-This isolation is per-statement, not free-standing atomicity across statements — if you need several queries to succeed or fail together, that's what `begin()` and `savepoint()` are for. Outside a transaction, every query stands on its own.
-
-
-### Errors you can pattern-match on
+// a: fulfilled — the balance update is committed
+// b: rejected — the duplicate key error only affects this query
+```
 
-Every call returns a `Future<T[], PostgresError>` from [fluent-future](https://www.npmjs.com/package/fluent-future) instead of a bare `Promise`. `await` still works exactly like you'd expect — but you also get typed errors and a way to handle them without a `try/catch` pyramid:
+Errors can be matched and recovered directly on the `Future`:
 
 ```typescript
-const users = await pool.query<User>`SELECT * FROM users WHERE id = ${1}`
-  .recoverIf(err => err.code === '42P01', [])  // undefined_table → []
-  .recoverIf(err => err.code === '23505', [])  // unique_violation → []
+const users = await pool.query<User>`
+  SELECT * FROM users WHERE id = ${1}
+`
+  .recoverIf(err => err.code === '42P01', []) // undefined_table → []
+  .recoverIf(err => err.code === '23505', []) // unique_violation → []
   .tapErr(err => logger.error(err))
 ```
 
+This isolation is per statement, not atomicity across multiple statements. If several queries must succeed or fail together, use `begin()` and `savepoint()`.
+
+
+### PostgreSQL Type Support
+
+The driver provides **100% support for PostgreSQL data types using the full binary protocol**. All supported types are encoded and decoded directly in PostgreSQL's binary wire format, without falling back to text-based parsing.
+
+For a complete list of supported PostgreSQL types, their JavaScript input/output types, and string formats, see the [PostgreSQL Data Types](./DATATYPES.md) reference.
+
 
 ### Transactions and savepoints
 

package/dist/connection.d.ts

@@ -26,9 +26,11 @@ export declare class Connection {
     private _listeningCallbacks;
     private _stmtCounter;
     private _nextStatement;
+    private _logError;
+    private _logQuery;
+    private _logNotice;
     private _registerShedule;
     private _shedule;
-    private _parseQuery;
     private _registerQuery;
     private constructor();
     /**
@@ -86,6 +88,7 @@ export declare class Connection {
     get isOpened(): boolean;
     /** Whether the connection is closed or closing. */
     get isClosed(): boolean;
+    private _tryFinishClosing;
     /**
      * Closes the connection, awaiting for all pending queries. Not usable afterward.
      */

package/dist/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiC,uBAAuB,EAAuC,GAAG,EAAiB,MAAM,SAAS,CAAA;AACzI,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAK3C,OAAO,EAAS,MAAM,EAAM,MAAM,eAAe,CAAA;AACjD,OAAO,EAAkD,aAAa,EAAE,MAAM,SAAS,CAAA;AAevF;;;;;;;;;GASG;AACH,qBAAa,UAAU;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IAEzC,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,MAAM,CAA6B;IAE3C,OAAO,CAAC,QAAQ,CAAsD;IACtE,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,aAAa,CAA2C;IAEhE,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,QAAQ,CAAuC;IAEvD,OAAO,CAAC,mBAAmB,CAAyD;IACpF,OAAO,CAAC,YAAY,CAAI;IAExB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,cAAc;IAYtB,OAAO;IAYP;;;OAGG;IACH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uBAAuB;IAkB1C;;;;;;OAMG;IACH,KAAK,CAAC,CAAC,SAAS,GAAG,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAatE,OAAO,CAAC,aAAa;IA4CrB;;;;;OAKG;IACH,OAAO,CAAC,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAazD,OAAO,CAAC,eAAe;IA2CvB;;;;;;OAMG;IACH,MAAM,CAAC,CAAC,SAAS,GAAG,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IA2BvE,OAAO,CAAC,cAAc;IA8CtB;;;;;;;OAOG;IACH,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;IAoB7D,2EAA2E;IAC3E,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,MAAW;IAOhD,sFAAsF;IACtF,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI;IAe/D,4EAA4E;IAC5E,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC;IAoB/F,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,iBAAiB;IA6BzB,OAAO,CAAC,qBAAqB;IAW7B,OAAO,KAAK,aAAa,GAExB;IAGD,OAAO,CAAC,aAAa;IAgIrB,kDAAkD;IAClD,IAAI,QAAQ,YAEX;IAGD,mDAAmD;IACnD,IAAI,QAAQ,YAEX;IAGD;;OAEG;IACH,KAAK;CAwBR"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiC,uBAAuB,EAAuC,GAAG,EAAiB,MAAM,SAAS,CAAA;AACzI,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAK3C,OAAO,EAAS,MAAM,EAAM,MAAM,eAAe,CAAA;AACjD,OAAO,EAAkD,aAAa,EAAE,MAAM,SAAS,CAAA;AAgBvF;;;;;;;;;GASG;AACH,qBAAa,UAAU;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IAEzC,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,MAAM,CAA6B;IAE3C,OAAO,CAAC,QAAQ,CAAsD;IACtE,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,aAAa,CAA2C;IAEhE,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,OAAO,CAAsC;IACrD,OAAO,CAAC,QAAQ,CAA6D;IAE7E,OAAO,CAAC,mBAAmB,CAAyD;IACpF,OAAO,CAAC,YAAY,CAAI;IAExB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,SAAS;IAYjB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,cAAc;IA6BtB,OAAO;IAYP;;;OAGG;IACH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uBAAuB;IAkB1C;;;;;;OAMG;IACH,KAAK,CAAC,CAAC,SAAS,GAAG,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAatE,OAAO,CAAC,aAAa;IAmDrB;;;;;OAKG;IACH,OAAO,CAAC,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAazD,OAAO,CAAC,eAAe;IAmDvB;;;;;;OAMG;IACH,MAAM,CAAC,CAAC,SAAS,GAAG,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IA2BvE,OAAO,CAAC,cAAc;IAwDtB;;;;;;;OAOG;IACH,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;IAoB7D,2EAA2E;IAC3E,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,MAAW;IAOhD,sFAAsF;IACtF,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI;IAe/D,4EAA4E;IAC5E,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC;IAoB/F,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,iBAAiB;IA6BzB,OAAO,CAAC,qBAAqB;IAW7B,OAAO,KAAK,aAAa,GAExB;IAGD,OAAO,CAAC,aAAa;IA4GrB,kDAAkD;IAClD,IAAI,QAAQ,YAEX;IAGD,mDAAmD;IACnD,IAAI,QAAQ,YAEX;IAGD,OAAO,CAAC,iBAAiB;IAczB;;OAEG;IACH,KAAK;CAoBR"}

package/dist/connection.js

@@ -3,7 +3,7 @@ import { compileSqlTemplate } from "./utils";
 import { Transaction } from "./transaction";
 import { SocketConnector } from "./protocol/socket-connector";
 import { Queue } from "./queue";
-import { CollectQuery, StreamQuery, ExecuteQuery } from "./query";
+import { CollectQuery, StreamQuery, ExecuteQuery, ParseQuery } from "./query";
 import { sql } from ".";
 import { Begin, Future, Ok } from 'fluent-future';
 import { ErrConnectionClosed, ErrConnectionReconnecting } from "./error";
@@ -29,6 +29,28 @@ export class Connection {
     _nextStatement() {
         return `s-${this._stmtCounter++}`;
     }
+    _logError(error) {
+        if (this.config.logLevel === 'error' || this.config.logLevel === 'notice' || this.config.logLevel === 'query') {
+            console.log(`\n\x1b[31m┌─ ERROR ────────────────────────────────────────\x1b[0m\n`
+                + `\x1b[31m│\x1b[0m ${error}\n`
+                + `\x1b[31m└────────────────────────────────────────────────\x1b[0m\n`);
+        }
+    }
+    _logQuery(text, args) {
+        if (this.config.logLevel === 'query') {
+            console.log(`\n\x1b[36m┌─ QUERY ─────────────────────────────────────────\x1b[0m\n`
+                + `\x1b[36m│\x1b[0m ${text}\n`
+                + `${args.length !== 0 ? `\x1b[36m│\x1b[0m \x1b[90mArguments:\x1b[0m [${args}]\n` : ''}`
+                + `\x1b[36m└────────────────────────────────────────────────\x1b[0m`);
+        }
+    }
+    _logNotice(notice) {
+        if (this.config.logLevel === 'notice' || this.config.logLevel === 'query') {
+            console.log(`\n\x1b[33m┌─ NOTICE ───────────────────────────────────────\x1b[0m\n`
+                + `\x1b[33m│\x1b[0m ${notice}\n`
+                + `\x1b[33m└────────────────────────────────────────────────\x1b[0m\n`);
+        }
+    }
     _registerShedule() {
         if (!this._sheduled) {
             this._sheduled = true;
@@ -39,23 +61,29 @@ export class Connection {
     _shedule() {
         if (this._reconnecting)
             return;
-        this._socket.write(this._writer);
+        this._writer.hasMore && this._socket.write(this._writer);
         this._writer.clear();
         this._sheduled = false;
     }
-    _parseQuery(query) {
-        this._registerShedule();
-        this._writer
-            .writeParse(query.statement, query.text)
-            .writeDescribe(DescribeType.Statement, query.statement);
-    }
     _registerQuery(query) {
         this._registerShedule();
-        this._queue.push(query);
+        if (query instanceof ParseQuery) {
+            this._writer
+                .writeParse(query.meta.statement, query.text)
+                .writeDescribe(DescribeType.Statement, query.meta.statement)
+                .writeSync();
+            this._queue.push(query);
+            return null;
+        }
+        const err = this._writer
+            .writeBind("", query.meta, query.args);
+        if (err)
+            return err;
         this._writer
-            .writeBind("", query.statement, query.args, this._parsed[query.text]?.parameters)
             .writeExecute("")
             .writeSync();
+        this._queue.push(query);
+        return null;
     }
     constructor(socket, config) {
         this._writer = ConnectionRequestBuffer.new(65536);
@@ -64,8 +92,8 @@ export class Connection {
         this._closing = null;
         this._closed = false;
         this._reconnecting = null;
-        this._parsed = {};
-        this._parsing = {};
+        this._parsed = new Map();
+        this._parsing = new Map();
         this._listeningCallbacks = new Map();
         this._stmtCounter = 0;
         this.config = config;
@@ -106,29 +134,32 @@ export class Connection {
         return this._performQuery(text, args, resolvers);
     }
     _performQuery(text, args, resolvers) {
-        if (this.config.logLevel === 'query') {
-            console.log(`\n\x1b[36m┌─ QUERY ─────────────────────────────────────────\x1b[0m\n`
-                + `\x1b[36m│\x1b[0m ${text}\n`
-                + `${args.length !== 0 ? `\x1b[36m│\x1b[0m \x1b[90mArguments:\x1b[0m [${args}]\n` : ''}`
-                + `\x1b[36m└────────────────────────────────────────────────\x1b[0m`);
-        }
-        const parsed = this._parsed[text];
+        this._logQuery(text, args);
+        const parsed = this._parsed.get(text);
         if (parsed) {
-            const query = new CollectQuery(parsed.statement, text, args, parsed.columns, this.config.queryTimeout, resolvers);
-            this._registerQuery(query);
+            const query = new CollectQuery(parsed, text, args, parsed.columns, resolvers, this.config.queryTimeout);
+            const err = this._registerQuery(query);
+            if (err) {
+                query.error(err);
+                this._logError(err);
+            }
             return query.resolvers.future;
         }
-        const parsing = this._parsing[text];
-        if (parsing) {
-            const query = new CollectQuery(parsing, text, args, null, this.config.queryTimeout, resolvers);
-            this._registerQuery(query);
-            return query.resolvers.future;
+        if (!this._parsing.has(text)) {
+            const parseQuery = new ParseQuery({ statement: this._nextStatement(), columns: EMPTY_ARRAY, parameters: EMPTY_ARRAY }, text, Future.withResolvers(), this.config.queryTimeout);
+            this._registerQuery(parseQuery);
+            this._parsing.set(text, parseQuery.resolvers.future);
         }
-        const query = new CollectQuery(this._nextStatement(), text, args, null, this.config.queryTimeout, resolvers);
-        this._parsing[text] = query.statement;
-        this._parseQuery(query);
-        this._registerQuery(query);
-        return query.resolvers.future;
+        const parsing = this._parsing.get(text);
+        return parsing.andThen(meta => {
+            const query = new CollectQuery(meta, text, args, meta.columns, resolvers, this.config.queryTimeout);
+            const err = this._registerQuery(query);
+            if (err) {
+                query.error(err);
+                this._logError(err);
+            }
+            return query.resolvers.future;
+        });
     }
     /**
      * Like {@link query}, but for statements that don't return rows (INSERT/UPDATE/DDL/etc).
@@ -146,29 +177,32 @@ export class Connection {
         return this._performExecute(text, args, resolvers);
     }
     _performExecute(text, args, resolvers) {
-        if (this.config.logLevel === 'query') {
-            console.log(`\n\x1b[35m┌─ EXECUTE ──────────────────────────────────────\x1b[0m\n`
-                + `\x1b[35m│\x1b[0m ${text}\n`
-                + `${args.length !== 0 ? `\x1b[35m│\x1b[0m \x1b[90mArguments:\x1b[0m [${args}]\n` : ''}`
-                + `\x1b[35m└────────────────────────────────────────────────\x1b[0m`);
-        }
-        const parsed = this._parsed[text];
+        this._logQuery(text, args);
+        const parsed = this._parsed.get(text);
         if (parsed) {
-            const query = new ExecuteQuery(parsed.statement, text, args, this.config.queryTimeout, resolvers);
-            this._registerQuery(query);
+            const query = new ExecuteQuery(parsed, text, args, resolvers, this.config.queryTimeout);
+            const err = this._registerQuery(query);
+            if (err) {
+                query.error(err);
+                this._logError(err);
+            }
             return query.resolvers.future;
         }
-        const parsing = this._parsing[text];
-        if (parsing) {
-            const query = new ExecuteQuery(parsing, text, args, this.config.queryTimeout, resolvers);
-            this._registerQuery(query);
-            return query.resolvers.future;
+        if (!this._parsing.has(text)) {
+            const parseQuery = new ParseQuery({ statement: this._nextStatement(), columns: EMPTY_ARRAY, parameters: EMPTY_ARRAY }, text, Future.withResolvers(), this.config.queryTimeout);
+            this._registerQuery(parseQuery);
+            this._parsing.set(text, parseQuery.resolvers.future);
         }
-        const query = new ExecuteQuery(this._nextStatement(), text, args, this.config.queryTimeout, resolvers);
-        this._parsing[text] = query.statement;
-        this._parseQuery(query);
-        this._registerQuery(query);
-        return query.resolvers.future;
+        const parsing = this._parsing.get(text);
+        return parsing.andThen(meta => {
+            const query = new ExecuteQuery(meta, text, args, resolvers, this.config.queryTimeout);
+            const err = this._registerQuery(query);
+            if (err) {
+                query.error(err);
+                this._logError(err);
+            }
+            return query.resolvers.future;
+        });
     }
     /**
      * Streams query results as a `ReadableStream`, without buffering rows in memory.
@@ -197,28 +231,36 @@ export class Connection {
         return stream;
     }
     _performStream(text, args, controller) {
-        if (this.config.logLevel === 'query') {
-            console.log(`\n\x1b[34m┌─ STREAM ───────────────────────────────────────\x1b[0m\n`
-                + `\x1b[34m│\x1b[0m ${text}\n`
-                + `${args.length !== 0 ? `\x1b[34m│\x1b[0m \x1b[90mArguments:\x1b[0m [${args}]\n` : ''}`
-                + `\x1b[34m└────────────────────────────────────────────────\x1b[0m`);
-        }
-        const parsed = this._parsed[text];
+        this._logQuery(text, args);
+        const parsed = this._parsed.get(text);
         if (parsed) {
-            const query = new StreamQuery(parsed.statement, text, args, controller, parsed.columns, this.config.queryTimeout);
-            this._registerQuery(query);
+            const query = new StreamQuery(parsed, text, args, controller, parsed.columns, this.config.queryTimeout);
+            const err = this._registerQuery(query);
+            if (err) {
+                controller.error(err);
+                this._logError(err);
+            }
             return;
         }
-        const parsing = this._parsing[text];
-        if (parsing) {
-            const query = new StreamQuery(parsing, text, args, controller, null, this.config.queryTimeout);
-            this._registerQuery(query);
-            return;
+        if (!this._parsing.has(text)) {
+            const parseQuery = new ParseQuery({ statement: this._nextStatement(), columns: EMPTY_ARRAY, parameters: EMPTY_ARRAY }, text, Future.withResolvers(), this.config.queryTimeout);
+            this._registerQuery(parseQuery);
+            this._parsing.set(text, parseQuery.resolvers.future);
         }
-        const query = new StreamQuery(this._nextStatement(), text, args, controller, null, this.config.queryTimeout);
-        this._parsing[text] = query.statement;
-        this._parseQuery(query);
-        this._registerQuery(query);
+        const parsing = this._parsing.get(text);
+        parsing
+            .tap(meta => {
+            const query = new StreamQuery(meta, text, args, controller, null, this.config.queryTimeout);
+            const err = this._registerQuery(query);
+            if (err) {
+                controller.error(err);
+                this._logError(err);
+            }
+        })
+            .tapErr(err => {
+            controller.error(err);
+        })
+            .recover();
     }
     /**
      * Runs `txCallback` inside `BEGIN`/`COMMIT`, rolling back on error.
@@ -294,8 +336,8 @@ export class Connection {
     }
     _performReconnect() {
         this._socket.destroy();
-        this._parsed = {};
-        this._parsing = {};
+        this._parsed.clear();
+        this._parsing.clear();
         this._sheduled = false;
         while (this._queue.hasMore) {
             this._queue.shift.error(ErrConnectionReconnecting);
@@ -324,37 +366,31 @@ export class Connection {
     _handlePacket(type, length, reader) {
         switch (type) {
             case ResponseTypes.ParseComplete:
-            case ResponseTypes.NoData:
-            case ResponseTypes.CloseComplete: break;
             case ResponseTypes.BindComplete:
+            case ResponseTypes.CloseComplete: break;
+            case ResponseTypes.ParameterDescription:
                 {
                     const query = this._currentQuery;
-                    if (query instanceof ExecuteQuery) {
-                        break;
-                    }
-                    if (!query.columns) {
-                        query.columns = this._parsed[query.text].columns;
-                    }
+                    const parameters = reader.readParameterDescription();
+                    query.meta.parameters = parameters;
                 }
                 break;
-            case ResponseTypes.ParameterDescription:
+            case ResponseTypes.RowDescription:
                 {
                     const query = this._currentQuery;
-                    const description = reader.readParameterDescription();
-                    const meta = {
-                        statement: query.statement,
-                        parameters: description,
-                        columns: EMPTY_ARRAY
-                    };
-                    delete this._parsing[query.text];
-                    this._parsed[query.text] = meta;
+                    const columns = reader.readRowDescription();
+                    query.meta.columns = columns;
+                    this._parsing.delete(query.text);
+                    this._parsed.set(query.text, query.meta);
+                    query.complete();
                 }
                 break;
-            case ResponseTypes.RowDescription:
+            case ResponseTypes.NoData:
                 {
                     const query = this._currentQuery;
-                    const columns = reader.readRowDescription();
-                    this._parsed[query.text].columns = columns;
+                    this._parsing.delete(query.text);
+                    this._parsed.set(query.text, query.meta);
+                    query.complete();
                 }
                 break;
             case ResponseTypes.DataRow:
@@ -364,7 +400,7 @@ export class Connection {
                         reader.skipBytes(length);
                         break;
                     }
-                    query.push(reader.readDataRow(query.columns, this.config.int8toBigint));
+                    query.push(reader.readDataRow(query.meta.columns, this.config.int8toBigint));
                 }
                 break;
             case ResponseTypes.ComandComplete:
@@ -377,15 +413,10 @@ export class Connection {
             case ResponseTypes.ErrorResponse:
                 {
                     const error = reader.readErrorResponse();
-                    if (this.config.logLevel === 'error' || this.config.logLevel === 'notice' || this.config.logLevel === 'query') {
-                        console.log(`\n\x1b[31m┌─ ERROR ────────────────────────────────────────\x1b[0m\n`
-                            + `\x1b[31m│\x1b[0m ${error}\n`
-                            + `\x1b[31m└────────────────────────────────────────────────\x1b[0m\n`);
-                    }
+                    this._logError(error);
                     const query = this._currentQuery;
-                    if (error.isParseError) {
-                        delete this._parsing[query.text];
-                    }
+                    if (query instanceof ParseQuery)
+                        this._parsing.delete(query.text);
                     query.error(error);
                 }
                 break;
@@ -393,17 +424,13 @@ export class Connection {
                 {
                     reader.skipBytes(length);
                     this._queue.next();
-                    this._closing && this._queue.isFree && this._closing.resolve();
+                    this._tryFinishClosing();
                 }
                 break;
             case ResponseTypes.Notice:
                 {
-                    const message = reader.readErrorResponse();
-                    if (this.config.logLevel === 'notice' || this.config.logLevel === 'query') {
-                        console.log(`\n\x1b[33m┌─ NOTICE ───────────────────────────────────────\x1b[0m\n`
-                            + `\x1b[33m│\x1b[0m ${message}\n`
-                            + `\x1b[33m└────────────────────────────────────────────────\x1b[0m\n`);
-                    }
+                    const notice = reader.readErrorResponse();
+                    this._logNotice(notice);
                 }
                 break;
             case ResponseTypes.NotificationResponse:
@@ -430,6 +457,19 @@ export class Connection {
     get isClosed() {
         return this._closed || !!this._closing;
     }
+    _tryFinishClosing() {
+        if (!this._closing)
+            return;
+        if (this._queue.hasMore)
+            return;
+        setTimeout(() => {
+            if (!this._closing)
+                return;
+            if (!this._queue.hasMore) {
+                this._closing.resolve();
+            }
+        }, 0);
+    }
     /**
      * Closes the connection, awaiting for all pending queries. Not usable afterward.
      */
@@ -439,11 +479,6 @@ export class Connection {
         if (this._closing) {
             return this._closing.future;
         }
-        if (this._queue.isFree) {
-            this._closed = true;
-            this._socket.destroy();
-            return Future.resolve();
-        }
         const closing = Future.withResolvers();
         this._closing = closing;
         closing.future.tap(() => {
@@ -451,6 +486,7 @@ export class Connection {
             this._closed = true;
             this._socket.destroy();
         });
+        this._tryFinishClosing();
         return closing.future;
     }
 }

package/dist/error.d.ts

@@ -1,3 +1,4 @@
+import { DataTypeOid } from "./protocol/constants";
 export declare class PostgresError extends Error {
     message: string;
     code: string;
@@ -30,4 +31,5 @@ export declare const ErrSSLDenied: PostgresError;
 export declare const ErrDatabaseNotFound: PostgresError;
 export declare const ErrUntrustedCertificate: PostgresError;
 export declare const ErrCertificateFileNotFound: PostgresError;
+export declare function createBindTypeError(index: number, expectedType: DataTypeOid, actualValue: unknown): PostgresError;
 //# sourceMappingURL=error.d.ts.map

package/dist/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"AAAA,qBAAa,aAAc,SAAQ,KAAK;IAEhB,OAAO,EAAE,MAAM;IACxB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,UAAU,EAAE,MAAM;gBART,OAAO,EAAE,MAAM,EACxB,IAAI,GAAE,MAAqB,EAC3B,MAAM,GAAE,MAAW,EACnB,QAAQ,GAAE,MAAW,EACrB,KAAK,GAAE,MAAW,EAClB,IAAI,GAAE,MAAW,EACjB,QAAQ,GAAE,MAAW,EACrB,QAAQ,GAAE,MAAW,EACrB,UAAU,GAAE,MAAW;IAMlC,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED,IAAI,WAAW,IAAI,OAAO,CAKzB;IAED,IAAI,uBAAuB,IAAI,OAAO,CAErC;IAED,IAAI,8BAA8B,IAAI,OAAO,CAE5C;IAED,IAAI,qBAAqB,IAAI,OAAO,CAEnC;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,mBAAmB,IAAI,OAAO,CAEjC;CACJ;AAGD,eAAO,MAAM,gBAAgB,eAAmF,CAAA;AAChH,eAAO,MAAM,mBAAmB,eAAqE,CAAA;AACrG,eAAO,MAAM,yBAAyB,eAAiD,CAAA;AAEvF,eAAO,MAAM,eAAe,eAA8C,CAAA;AAE1E,eAAO,MAAM,aAAa,eAAkE,CAAA;AAE5F,eAAO,MAAM,oBAAoB,eAA6E,CAAA;AAE9G,eAAO,MAAM,mBAAmB,eAA8E,CAAA;AAC9G,eAAO,MAAM,yBAAyB,eAA2F,CAAA;AACjI,eAAO,MAAM,YAAY,eAA4D,CAAA;AACrF,eAAO,MAAM,mBAAmB,eAAwD,CAAA;AACxF,eAAO,MAAM,uBAAuB,eAA4E,CAAA;AAChH,eAAO,MAAM,0BAA0B,eAAkF,CAAA"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAA;AAGhE,qBAAa,aAAc,SAAQ,KAAK;IAEhB,OAAO,EAAE,MAAM;IACxB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,UAAU,EAAE,MAAM;gBART,OAAO,EAAE,MAAM,EACxB,IAAI,GAAE,MAAqB,EAC3B,MAAM,GAAE,MAAW,EACnB,QAAQ,GAAE,MAAW,EACrB,KAAK,GAAE,MAAW,EAClB,IAAI,GAAE,MAAW,EACjB,QAAQ,GAAE,MAAW,EACrB,QAAQ,GAAE,MAAW,EACrB,UAAU,GAAE,MAAW;IAMlC,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED,IAAI,WAAW,IAAI,OAAO,CAKzB;IAED,IAAI,uBAAuB,IAAI,OAAO,CAErC;IAED,IAAI,8BAA8B,IAAI,OAAO,CAE5C;IAED,IAAI,qBAAqB,IAAI,OAAO,CAEnC;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,mBAAmB,IAAI,OAAO,CAEjC;CACJ;AAGD,eAAO,MAAM,gBAAgB,eAAmF,CAAA;AAChH,eAAO,MAAM,mBAAmB,eAAqE,CAAA;AACrG,eAAO,MAAM,yBAAyB,eAAiD,CAAA;AAEvF,eAAO,MAAM,eAAe,eAA8C,CAAA;AAE1E,eAAO,MAAM,aAAa,eAAkE,CAAA;AAE5F,eAAO,MAAM,oBAAoB,eAA6E,CAAA;AAE9G,eAAO,MAAM,mBAAmB,eAA8E,CAAA;AAC9G,eAAO,MAAM,yBAAyB,eAA2F,CAAA;AACjI,eAAO,MAAM,YAAY,eAA4D,CAAA;AACrF,eAAO,MAAM,mBAAmB,eAAwD,CAAA;AACxF,eAAO,MAAM,uBAAuB,eAA4E,CAAA;AAChH,eAAO,MAAM,0BAA0B,eAAkF,CAAA;AAgCzH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,GAAG,aAAa,CAqBjH"}

package/dist/error.js

@@ -1,3 +1,4 @@
+import { handlers } from "./protocol/types";
 export class PostgresError extends Error {
     constructor(message, code = 'undeclared', detail = '', severity = '', where = '', hint = '', position = '', dataType = '', constraint = '') {
         super(message);
@@ -51,3 +52,43 @@ export const ErrSSLDenied = new PostgresError("SSL is required but server denied
 export const ErrDatabaseNotFound = new PostgresError('Database with that dsn not found');
 export const ErrUntrustedCertificate = new PostgresError("Database SSL certificate is untrusted or self-signed");
 export const ErrCertificateFileNotFound = new PostgresError("The SSL certificate file specified in caPath was not found");
+function describeValue(value) {
+    if (value === null)
+        return 'null';
+    if (value === undefined)
+        return 'undefined';
+    if (typeof value === 'bigint')
+        return `${value}n`;
+    if (typeof value === 'string') {
+        return value.length > 60 ? `${JSON.stringify(value.slice(0, 60))}…` : JSON.stringify(value);
+    }
+    if (Buffer.isBuffer(value) || value instanceof Uint8Array) {
+        return `Uint8Array(length=${value.length})`;
+    }
+    if (value instanceof Date) {
+        return `Date(${isNaN(value.getTime()) ? 'Invalid Date' : value.toISOString()})`;
+    }
+    if (Array.isArray(value)) {
+        const preview = value.slice(0, 5).map(describeValue).join(', ');
+        return `[${preview}${value.length > 5 ? ', …' : ''}] (length=${value.length})`;
+    }
+    if (typeof value === 'object') {
+        try {
+            const json = JSON.stringify(value);
+            return json.length > 120 ? `${json.slice(0, 120)}…` : json;
+        }
+        catch {
+            return Object.prototype.toString.call(value);
+        }
+    }
+    return String(value);
+}
+export function createBindTypeError(index, expectedType, actualValue) {
+    const position = index + 1;
+    const info = handlers[expectedType];
+    const expectedPgType = info?.pgType ?? `oid ${expectedType}`;
+    const expectedJsShape = info?.jsShape ?? '(тип не описан в справочнике)';
+    const message = `Bind error: Parameter $${position} type mismatch. ` +
+        `Expected PostgreSQL type "${expectedPgType}" (${expectedJsShape}), received: ${describeValue(actualValue)}.`;
+    return new PostgresError(message, '22000', `Parameter $${position} failed client-side binary validation for pg type "${expectedPgType}".`, 'ERROR', 'writeBind() inside driver', `Pass a value matching ${expectedJsShape} for $${position}.`, '', expectedPgType);
+}