@m2k-5f/pgtx 2.8.0 → 2.8.2

package/dist/connection.js

@@ -6,7 +6,7 @@ import { Queue } from "./queue";
 import { CollectQuery, StreamQuery, ExecuteQuery, ParseQuery } from "./query";
 import { sql } from ".";
 import { Begin, Future, Ok } from 'fluent-future';
-import { ErrConnectionClosed, ErrConnectionReconnecting } from "./error";
+import { ErrConnectionClosed, ErrConnectionReconnecting, ErrTransactionInProgress } from "./error";
 import { nextTick } from "process";
 import { authorizeSocket, createSocket, upgradeSocket } from "./protocol/socket-authorization";
 import { ConnectionRequestBuffer } from "./protocol/connection-request-writer";
@@ -29,14 +29,36 @@ export class Connection {
     _nextStatement() {
         return `s-${this._stmtCounter++}`;
     }
-    _registerShedule() {
+    _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`);
+        }
+    }
+    _registerSсhedule() {
         if (!this._sheduled) {
             this._sheduled = true;
             this._writer.clear();
-            shedule[this.config.syncShedule](() => this._shedule());
+            shedule[this.config.syncSсhedule](() => this._sсhedule());
         }
     }
-    _shedule() {
+    _sсhedule() {
         if (this._reconnecting)
             return;
         this._writer.hasMore && this._socket.write(this._writer);
@@ -44,7 +66,7 @@ export class Connection {
         this._sheduled = false;
     }
     _registerQuery(query) {
-        this._registerShedule();
+        this._registerSсhedule();
         if (query instanceof ParseQuery) {
             this._writer
                 .writeParse(query.meta.statement, query.text)
@@ -67,12 +89,12 @@ export class Connection {
         this._writer = ConnectionRequestBuffer.new(65536);
         this._sheduled = false;
         this._queue = new Queue();
-        this._executingCounter = 0;
         this._closing = null;
         this._closed = false;
         this._reconnecting = null;
-        this._parsed = {};
-        this._parsing = {};
+        this._inTransaction = false;
+        this._parsed = new Map();
+        this._parsing = new Map();
         this._listeningCallbacks = new Map();
         this._stmtCounter = 0;
         this.config = config;
@@ -88,7 +110,7 @@ export class Connection {
             logLevel: config.logLevel || 'error',
             int8toBigint: config.int8toBigint || false,
             queryTimeout: config.queryTimeout || 30000,
-            syncShedule: config.syncShedule || 'Immediate',
+            syncSсhedule: config.syncSсhedule || 'Immediate',
             ssl: config.caPath ? 'require' : (config.ssl || 'prefer')
         };
         return createSocket(conf)
@@ -104,46 +126,52 @@ export class Connection {
      * const users = await conn.query<User>`SELECT * FROM users WHERE id = ${1}`
      */
     query(templates, ...params) {
-        if (this.isClosed)
+        if (this.isClosed) {
+            this._logError(ErrConnectionClosed);
             return Future.reject(ErrConnectionClosed);
+        }
+        if (this._inTransaction) {
+            this._logError(ErrTransactionInProgress);
+            return Future.reject(ErrTransactionInProgress);
+        }
         const { text, args } = compileSqlTemplate(templates, params);
         const resolvers = Future.withResolvers();
-        if (this._reconnecting)
-            return this._reconnecting.andThen(() => this._performQuery(text, args, resolvers));
+        if (this._reconnecting) {
+            return this._reconnecting
+                .tapErr(err => this._logError(err))
+                .andThen(() => this._performQuery(text, args, resolvers));
+        }
         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`);
-        }
-        this._executingCounter++;
-        const parsed = this._parsed[text];
+        this._logQuery(text, args);
+        const parsed = this._parsed.get(text);
         if (parsed) {
-            const query = new CollectQuery(parsed, text, args, parsed.columns, resolvers, this.config.queryTimeout);
+            const query = new CollectQuery(text, args, parsed, resolvers, this.config.queryTimeout);
             const err = this._registerQuery(query);
             if (err) {
-                this._executingCounter--;
                 query.error(err);
-                return query.resolvers.future;
+                this._logError(err);
             }
             return query.resolvers.future;
         }
-        if (!this._parsing[text]) {
-            const parseQuery = new ParseQuery({ statement: this._nextStatement(), columns: EMPTY_ARRAY, parameters: EMPTY_ARRAY }, text, Future.withResolvers(), this.config.queryTimeout);
+        if (!this._parsing.has(text)) {
+            const newMeta = {
+                statement: this._nextStatement(),
+                columns: EMPTY_ARRAY,
+                parameters: EMPTY_ARRAY
+            };
+            const parseQuery = new ParseQuery(text, newMeta, Future.withResolvers(), this.config.queryTimeout);
             this._registerQuery(parseQuery);
-            this._parsing[text] = parseQuery.resolvers.future;
+            this._parsing.set(text, parseQuery.resolvers.future);
         }
-        const parsing = this._parsing[text];
+        const parsing = this._parsing.get(text);
         return parsing.andThen(meta => {
-            const query = new CollectQuery(meta, text, args, meta.columns, resolvers, this.config.queryTimeout);
+            const query = new CollectQuery(text, args, meta, resolvers, this.config.queryTimeout);
             const err = this._registerQuery(query);
             if (err) {
-                this._executingCounter--;
                 query.error(err);
-                return query.resolvers.future;
+                this._logError(err);
             }
             return query.resolvers.future;
         });
@@ -155,46 +183,52 @@ export class Connection {
      * await conn.execute`UPDATE users SET name = ${name} WHERE id = ${id}`
      */
     execute(templates, ...params) {
-        if (this.isClosed)
+        if (this.isClosed) {
+            this._logError(ErrConnectionClosed);
             return Future.reject(ErrConnectionClosed);
+        }
+        if (this._inTransaction) {
+            this._logError(ErrTransactionInProgress);
+            return Future.reject(ErrTransactionInProgress);
+        }
         const { text, args } = compileSqlTemplate(templates, params);
         const resolvers = Future.withResolvers();
-        if (this._reconnecting)
-            return this._reconnecting.andThen(() => this._performExecute(text, args, resolvers));
+        if (this._reconnecting) {
+            return this._reconnecting
+                .tapErr(err => this._logError(err))
+                .andThen(() => this._performExecute(text, args, resolvers));
+        }
         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`);
-        }
-        this._executingCounter++;
-        const parsed = this._parsed[text];
+        this._logQuery(text, args);
+        const parsed = this._parsed.get(text);
         if (parsed) {
-            const query = new ExecuteQuery(parsed, text, args, resolvers, this.config.queryTimeout);
+            const query = new ExecuteQuery(text, args, parsed, resolvers, this.config.queryTimeout);
             const err = this._registerQuery(query);
             if (err) {
-                this._executingCounter--;
                 query.error(err);
-                return query.resolvers.future;
+                this._logError(err);
             }
             return query.resolvers.future;
         }
-        if (!this._parsing[text]) {
-            const parseQuery = new ParseQuery({ statement: this._nextStatement(), columns: EMPTY_ARRAY, parameters: EMPTY_ARRAY }, text, Future.withResolvers(), this.config.queryTimeout);
+        if (!this._parsing.has(text)) {
+            const newMeta = {
+                statement: this._nextStatement(),
+                columns: EMPTY_ARRAY,
+                parameters: EMPTY_ARRAY
+            };
+            const parseQuery = new ParseQuery(text, newMeta, Future.withResolvers(), this.config.queryTimeout);
             this._registerQuery(parseQuery);
-            this._parsing[text] = parseQuery.resolvers.future;
+            this._parsing.set(text, parseQuery.resolvers.future);
         }
-        const parsing = this._parsing[text];
+        const parsing = this._parsing.get(text);
         return parsing.andThen(meta => {
-            const query = new ExecuteQuery(meta, text, args, resolvers, this.config.queryTimeout);
+            const query = new ExecuteQuery(text, args, meta, resolvers, this.config.queryTimeout);
             const err = this._registerQuery(query);
             if (err) {
-                this._executingCounter--;
                 query.error(err);
-                return query.resolvers.future;
+                this._logError(err);
             }
             return query.resolvers.future;
         });
@@ -207,8 +241,14 @@ export class Connection {
      * for await (const row of conn.stream<User>`SELECT * FROM orders`) { ... }
      */
     stream(templates, ...params) {
-        if (this.isClosed)
+        if (this.isClosed) {
+            this._logError(ErrConnectionClosed);
             throw ErrConnectionClosed;
+        }
+        if (this._inTransaction) {
+            this._logError(ErrTransactionInProgress);
+            throw (ErrTransactionInProgress);
+        }
         const { text, args } = compileSqlTemplate(templates, params);
         let controller;
         const stream = new ReadableStream({
@@ -219,43 +259,42 @@ export class Connection {
         if (this._reconnecting) {
             this._reconnecting
                 .tap(() => this._performStream(text, args, controller))
-                .tapErr(err => controller.error(err));
+                .tapErr(err => {
+                this._logError(err);
+                controller.error(err);
+            })
+                .recover();
             return stream;
         }
         this._performStream(text, args, controller);
         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`);
-        }
-        this._executingCounter++;
-        const parsed = this._parsed[text];
+        this._logQuery(text, args);
+        const parsed = this._parsed.get(text);
         if (parsed) {
-            const query = new StreamQuery(parsed, text, args, controller, parsed.columns, this.config.queryTimeout);
+            const query = new StreamQuery(text, args, parsed, controller, this.config.queryTimeout);
             const err = this._registerQuery(query);
             if (err) {
-                this._executingCounter--;
                 controller.error(err);
+                this._logError(err);
             }
             return;
         }
-        if (!this._parsing[text]) {
-            const parseQuery = new ParseQuery({ statement: this._nextStatement(), columns: EMPTY_ARRAY, parameters: EMPTY_ARRAY }, text, Future.withResolvers(), this.config.queryTimeout);
+        if (!this._parsing.has(text)) {
+            const newMeta = { statement: this._nextStatement(), columns: EMPTY_ARRAY, parameters: EMPTY_ARRAY };
+            const parseQuery = new ParseQuery(text, newMeta, Future.withResolvers(), this.config.queryTimeout);
             this._registerQuery(parseQuery);
-            this._parsing[text] = parseQuery.resolvers.future;
+            this._parsing.set(text, parseQuery.resolvers.future);
         }
-        const parsing = this._parsing[text];
+        const parsing = this._parsing.get(text);
         parsing
             .tap(meta => {
-            const query = new StreamQuery(meta, text, args, controller, null, this.config.queryTimeout);
+            const query = new StreamQuery(text, args, meta, controller, this.config.queryTimeout);
             const err = this._registerQuery(query);
             if (err) {
-                this._executingCounter--;
                 controller.error(err);
+                this._logError(err);
             }
         })
             .tapErr(err => {
@@ -272,13 +311,12 @@ export class Connection {
      * })
      */
     begin(txCallback) {
-        if (this.isClosed)
-            return Future.reject(ErrConnectionClosed);
         return Begin()
             .andThen(() => this.execute `begin`)
             .andThen(() => {
+            this._inTransaction = true;
             const tx = new Transaction(this);
-            return Future.of(txCallback(tx))
+            return Future.of(() => txCallback(tx))
                 .tap(() => {
                 if (tx.isActive)
                     return tx.commit();
@@ -287,29 +325,25 @@ export class Connection {
                 if (tx.isActive)
                     return tx.rollback();
             });
-        });
+        })
+            .finally(() => this._inTransaction = false);
     }
     /** Sends a `pg_notify` message on `channelName` (payload ≤ 8000 bytes). */
     notify(channelName, payload = "") {
-        if (this.isClosed)
-            return Future.reject(ErrConnectionClosed);
-        return this.execute `select pg_notify(${channelName}, ${payload})`.map(() => { });
+        return this.execute `select pg_notify(${channelName}, ${payload})`;
     }
     /** Subscribes `callback` to `channelName`, issuing `LISTEN` on first subscription. */
     listen(channelName, callback) {
-        if (this.isClosed)
-            return Future.reject(ErrConnectionClosed);
-        if (!this._listeningCallbacks.has(channelName)) {
-            this._listeningCallbacks.set(channelName, new Set());
-        }
-        const callbackSet = this._listeningCallbacks.get(channelName);
-        callbackSet.add(callback);
-        return this.execute `listen ${sql.ident(channelName)};`;
+        return this.execute `listen ${sql.ident(channelName)};`
+            .tap(() => {
+            if (!this._listeningCallbacks.has(channelName)) {
+                this._listeningCallbacks.set(channelName, new Set());
+            }
+            this._listeningCallbacks.get(channelName).add(callback);
+        });
     }
     /** Unsubscribes `callback`, issuing `UNLISTEN` once no callbacks remain. */
     unlisten(channelName, callback) {
-        if (this.isClosed)
-            return Future.reject(ErrConnectionClosed);
         if (!this._listeningCallbacks.has(channelName)) {
             return Ok();
         }
@@ -317,7 +351,7 @@ export class Connection {
         callbackSet.delete(callback);
         if (callbackSet.size === 0) {
             this._listeningCallbacks.delete(channelName);
-            return this.execute `unlisten ${sql.ident(channelName)};`.map(() => { });
+            return this.execute `unlisten ${sql.ident(channelName)};`;
         }
         return Ok();
     }
@@ -337,10 +371,9 @@ export class Connection {
     }
     _performReconnect() {
         this._socket.destroy();
-        this._parsed = {};
-        this._parsing = {};
+        this._parsed.clear();
+        this._parsing.clear();
         this._sheduled = false;
-        this._executingCounter = 0;
         while (this._queue.hasMore) {
             this._queue.shift.error(ErrConnectionReconnecting);
         }
@@ -382,16 +415,16 @@ export class Connection {
                     const query = this._currentQuery;
                     const columns = reader.readRowDescription();
                     query.meta.columns = columns;
-                    delete this._parsing[query.text];
-                    this._parsed[query.text] = query.meta;
+                    this._parsing.delete(query.text);
+                    this._parsed.set(query.text, query.meta);
                     query.complete();
                 }
                 break;
             case ResponseTypes.NoData:
                 {
                     const query = this._currentQuery;
-                    delete this._parsing[query.text];
-                    this._parsed[query.text] = query.meta;
+                    this._parsing.delete(query.text);
+                    this._parsed.set(query.text, query.meta);
                     query.complete();
                 }
                 break;
@@ -410,40 +443,29 @@ export class Connection {
                     reader.skipBytes(length);
                     const query = this._currentQuery;
                     query.complete();
-                    this._executingCounter--;
                 }
                 break;
             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);
-                    this._executingCounter--;
                 }
                 break;
             case ResponseTypes.ReadyForQuery:
                 {
                     reader.skipBytes(length);
                     this._queue.next();
-                    this._closing && !this._executingCounter && 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:
@@ -470,6 +492,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.
      */
@@ -479,11 +514,6 @@ export class Connection {
         if (this._closing) {
             return this._closing.future;
         }
-        if (!this._executingCounter) {
-            this._closed = true;
-            this._socket.destroy();
-            return Future.resolve();
-        }
         const closing = Future.withResolvers();
         this._closing = closing;
         closing.future.tap(() => {
@@ -491,6 +521,7 @@ export class Connection {
             this._closed = true;
             this._socket.destroy();
         });
+        this._tryFinishClosing();
         return closing.future;
     }
 }

package/dist/error.d.ts

@@ -31,5 +31,6 @@ export declare const ErrSSLDenied: PostgresError;
 export declare const ErrDatabaseNotFound: PostgresError;
 export declare const ErrUntrustedCertificate: PostgresError;
 export declare const ErrCertificateFileNotFound: PostgresError;
+export declare const ErrTransactionInProgress: 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,OAAO,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAA;AAEhE,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;AAEzH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,GAAG,aAAa,CAcjH"}
+{"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;AACzH,eAAO,MAAM,wBAAwB,eAGpC,CAAA;AA+BD,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,14 +52,44 @@ 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");
+export const ErrTransactionInProgress = new PostgresError("This connection has an active transaction — use the Transaction object passed into begin()'s callback instead of the Connection directly", 'transaction_in_progress', '', "ERROR");
+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).toString();
-    const actualType = actualValue === null ? 'null' : typeof actualValue;
-    const message = `Bind error: Parameter $${position} type mismatch. Expected ${expectedType}, received "${actualType}(${actualValue})".`;
-    return new PostgresError(message, '22000', // code
-    `The parameter at position $${position} failed client-side binary validation.`, // detail
-    'ERROR', // severity
-    'writeBind() inside driver', // where
-    `Ensure that the argument passed as $${position} matches the PostgreSQL schema requirements.` // hint
-    );
+    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);
 }

package/dist/index.d.ts

@@ -2,6 +2,35 @@ import { Pool as PgtxPool } from "./pool";
 import { IdentifierClause, InsertClause, ArrayClause, UpdateClause, ExcludeUpdateClause, WhereClause, LiteralClause, FragmentClause } from './clauses';
 import { Connection } from "./connection";
 import { Transaction } from "./transaction";
+export type PgPoint = {
+    x: number;
+    y: number;
+};
+export type PgLine = {
+    a: number;
+    b: number;
+    c: number;
+};
+export type PgLineSegment = {
+    a: PgPoint;
+    b: PgPoint;
+};
+export type PgBox = {
+    high: PgPoint;
+    low: PgPoint;
+};
+export type PgPath = {
+    closed: boolean;
+    points: PgPoint[];
+};
+export type PgPolygon = {
+    points: PgPoint[];
+};
+export type PgInterval = {
+    months: number;
+    days: number;
+    microseconds: number;
+};
 /**
  * Core SQL tagging utility for Pgtx.
  * Provides type-safe helpers for building dynamic queries with recursive support.
@@ -16,7 +45,7 @@ export declare const sql: {
      * // Result: (name, age) VALUES ($1, $2)
      *
      * @example
-     * sql.insert([{ id: 1 }, { id: 2 }])
+     * sql.insert({ id: 1 }, { id: 2 })
      * // Result: (id) VALUES ($1), ($2)
      */
     insert: typeof InsertClause.create;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EACH,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,mBAAmB,EAEnB,WAAW,EACX,aAAa,EACb,cAAc,EACjB,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C;;;GAGG;AACH,eAAO,MAAM,GAAG;IACZ;;;;;;;;;;;OAWG;;IAGH;;;;;;OAMG;;IAGH;;;;;;OAMG;;IAGH;;;;;;;;OAQG;;IAGH;;;;;;;;;;;KAWC;;IAGD;;;;;;;;;;OAUG;;IAGH;;;;;;;OAOG;;IAGH;;;;;;;;OAQG;;IAGH;;;;;;;;;;;;;;;;;;;OAmBG;;CAEN,CAAA;AAGD;;;GAGG;AAEH,OAAO,EAAE,UAAU,IAAI,UAAU,EAAE,CAAA;AAEnC,OAAO,EAAE,WAAW,IAAI,WAAW,EAAE,CAAA;AAErC,OAAO,EAAE,QAAQ,IAAI,IAAI,EAAE,CAAA;AAG3B,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EACH,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,mBAAmB,EAEnB,WAAW,EACX,aAAa,EACb,cAAc,EACjB,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,MAAM,MAAM,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAC9C,MAAM,MAAM,MAAM,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AACxD,MAAM,MAAM,aAAa,GAAG;IAAE,CAAC,EAAE,OAAO,CAAC;IAAC,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AACtD,MAAM,MAAM,KAAK,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,OAAO,CAAA;CAAE,CAAA;AACnD,MAAM,MAAM,MAAM,GAAG;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAAA;AAC3D,MAAM,MAAM,SAAS,GAAG;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAAA;AAC7C,MAAM,MAAM,UAAU,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAA;AAE/E;;;GAGG;AACH,eAAO,MAAM,GAAG;IACZ;;;;;;;;;;;OAWG;;IAGH;;;;;;OAMG;;IAGH;;;;;;OAMG;;IAGH;;;;;;;;OAQG;;IAGH;;;;;;;;;;;KAWC;;IAGD;;;;;;;;;;OAUG;;IAGH;;;;;;;OAOG;;IAGH;;;;;;;;OAQG;;IAGH;;;;;;;;;;;;;;;;;;;OAmBG;;CAEN,CAAA;AAGD;;;GAGG;AAEH,OAAO,EAAE,UAAU,IAAI,UAAU,EAAE,CAAA;AAEnC,OAAO,EAAE,WAAW,IAAI,WAAW,EAAE,CAAA;AAErC,OAAO,EAAE,QAAQ,IAAI,IAAI,EAAE,CAAA;AAG3B,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}

package/dist/index.js

@@ -16,7 +16,7 @@ export const sql = {
      * // Result: (name, age) VALUES ($1, $2)
      *
      * @example
-     * sql.insert([{ id: 1 }, { id: 2 }])
+     * sql.insert({ id: 1 }, { id: 2 })
      * // Result: (id) VALUES ($1), ($2)
      */
     insert: InsertClause.create,

package/dist/pool.d.ts

@@ -73,6 +73,8 @@ export declare class Pool {
     get size(): number;
     /** Total connections managed (idle + in use). */
     get total(): number;
+    get isOpened(): boolean;
+    get isClosed(): boolean;
     /**
      * Closes idle connections and rejects pending `acquire()` calls. Not usable afterward.
      */

package/dist/pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,EAAS,MAAM,EAAM,MAAM,eAAe,CAAC;AAClD,OAAO,EAAiB,aAAa,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAc,iBAAiB,EAAE,GAAG,EAAU,MAAM,SAAS,CAAC;AAIrE;;;;;;;;GAQG;AACH,qBAAa,IAAI;IACb,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,SAAS,CAAO;gBAEZ,MAAM,EAAE,iBAAiB;IAOrC;;;OAGG;IACH,OAAO;IA2BP;;;;;OAKG;IACH,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC;IAUnD,wFAAwF;IACxF,OAAO,CAAC,IAAI,EAAE,UAAU;IAoBxB;;;;;;;OAOG;IACH,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;IAU7D;;;;;OAKG;IACH,KAAK,CAAC,CAAC,SAAS,GAAG,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAuBpE,qEAAqE;IACrE,OAAO,CAAC,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAuBzD;;;;;OAKG;IACH,MAAM,CAAC,CAAC,SAAS,GAAG,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC;IAsC3F,2EAA2E;IAC3E,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,MAAW;IAQhD;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI;IAY3D,kCAAkC;IAClC,IAAI,IAAI,WAEP;IAGD,iDAAiD;IACjD,IAAI,KAAK,WAER;IAGD;;OAEG;IACH,KAAK;CAiBR"}
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,EAAS,MAAM,EAAM,MAAM,eAAe,CAAC;AAClD,OAAO,EAAiB,aAAa,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAc,iBAAiB,EAAE,GAAG,EAAU,MAAM,SAAS,CAAC;AAIrE;;;;;;;;GAQG;AACH,qBAAa,IAAI;IACb,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,SAAS,CAAO;gBAEZ,MAAM,EAAE,iBAAiB;IAOrC;;;OAGG;IACH,OAAO;IA2BP;;;;;OAKG;IACH,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC;IAUnD,wFAAwF;IACxF,OAAO,CAAC,IAAI,EAAE,UAAU;IAoBxB;;;;;;;OAOG;IACH,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;IAU7D;;;;;OAKG;IACH,KAAK,CAAC,CAAC,SAAS,GAAG,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAuBpE,qEAAqE;IACrE,OAAO,CAAC,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAuBzD;;;;;OAKG;IACH,MAAM,CAAC,CAAC,SAAS,GAAG,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC;IAsC3F,2EAA2E;IAC3E,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,MAAW;IAQhD;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI;IAY3D,kCAAkC;IAClC,IAAI,IAAI,WAEP;IAGD,iDAAiD;IACjD,IAAI,KAAK,WAER;IAGD,IAAI,QAAQ,YAEX;IAGD,IAAI,QAAQ,YAEX;IAGD;;OAEG;IACH,KAAK;CAiBR"}