@m2k-5f/pgtx 2.5.2 → 2.5.4

package/dist/clauses/array.clause.js

@@ -16,13 +16,13 @@ export class ArrayClause extends Clause {
                 throw new TypeError(`Array item at index ${index} is undefined`);
             }
             if (index)
-                params.text.push(this.separator);
+                params.text += this.separator;
             if (value instanceof Clause) {
                 value.mapIntoQuery(params);
             }
             else {
                 params.args.push(value);
-                params.text.push(`$${params.args.length}`);
+                params.text += `$${params.args.length}`;
             }
         });
     }

package/dist/clauses/exclude.clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exclude.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/exclude.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,qBAAa,mBAAoB,SAAQ,MAAM;IAEvC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE;IAD7B,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,mBAAmB;IAI7C,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAMnD"}
+{"version":3,"file":"exclude.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/exclude.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,qBAAa,mBAAoB,SAAQ,MAAM;IAEvC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE;IAD7B,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,mBAAmB;IAI7C,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAInD"}

package/dist/clauses/exclude.clause.js

@@ -8,7 +8,7 @@ export class ExcludeUpdateClause extends Clause {
         return new ExcludeUpdateClause(fields);
     }
     mapIntoQuery(params) {
-        params.text.push(this.fields.map(f => `${f} = EXCLUDED.${f}`)
-            .join(', '));
+        params.text += this.fields.map(f => `${f} = EXCLUDED.${f}`)
+            .join(', ');
     }
 }

package/dist/clauses/fragment.clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fragment.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/fragment.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAI,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAoB,MAAM,UAAU,CAAC;AAElE,qBAAa,cAAe,SAAQ,MAAM;IAElC,QAAQ,CAAC,SAAS,EAAE,oBAAoB;IACxC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;IAFxB,OAAO;IAKP,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAIpD,YAAY,CAAC,MAAM,EAAE,oBAAoB;CASrD"}
+{"version":3,"file":"fragment.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/fragment.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAI,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAoB,MAAM,UAAU,CAAC;AAElE,qBAAa,cAAe,SAAQ,MAAM;IAElC,QAAQ,CAAC,SAAS,EAAE,oBAAoB;IACxC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;IAFxB,OAAO;IAKP,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAIpD,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAMrD"}

package/dist/clauses/fragment.clause.js

@@ -10,11 +10,8 @@ export class FragmentClause extends Clause {
         return new FragmentClause(strings, values);
     }
     mapIntoQuery(params) {
-        const compiled = compileSqlTemplate({
-            args: this.args,
-            templates: this.templates
-        }, params.args.length);
+        const compiled = compileSqlTemplate(this.templates, this.args, params.args.length);
         params.args.push(...compiled.args);
-        params.text.push(compiled.text);
+        params.text += compiled.text;
     }
 }

package/dist/clauses/iden.caluse.js

@@ -10,6 +10,6 @@ export class IdentifierClause extends Clause {
         return new IdentifierClause(identificator);
     }
     mapIntoQuery(params) {
-        params.text.push(`"${this.value}"`);
+        params.text += `"${this.value}"`;
     }
 }

package/dist/clauses/insert.clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/insert.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAE,SAAQ,MAAM;IAE/D,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE;IADzB,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE;IAO5D,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAyBrD"}
+{"version":3,"file":"insert.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/insert.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAE,SAAQ,MAAM;IAE/D,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE;IADzB,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE;IAO5D,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAwBrD"}

package/dist/clauses/insert.clause.js

@@ -13,20 +13,21 @@ export class InsertClause extends Clause {
     mapIntoQuery(params) {
         const columns = Object.keys(this.inserts[0]);
         const columnsCount = columns.length;
-        params.text.push(`(${columns.join(', ')}) VALUES `);
+        params.text += `(${columns.join(', ')}) VALUES `;
         this.inserts.forEach((object, index) => {
             if (Object.keys(object).length !== columnsCount) {
                 throw new Error(`all rows must have the same columns`);
             }
             if (index)
-                params.text.push(', ');
-            params.text.push(`(${Object.values(object).map(value => {
-                if (value === undefined)
-                    return "DEFAULT";
-                params.args.push(value);
-                return `$${params.args.length}`;
-            })
-                .join(", ")})`);
+                params.text += ', ';
+            params.text +=
+                `(${Object.values(object).map(value => {
+                    if (value === undefined)
+                        return "DEFAULT";
+                    params.args.push(value);
+                    return `$${params.args.length}`;
+                })
+                    .join(", ")})`;
         });
     }
 }

package/dist/clauses/literal.clause.js

@@ -11,6 +11,6 @@ export class LiteralClause extends Clause {
         return new LiteralClause(value);
     }
     mapIntoQuery(params) {
-        params.text.push(this.value);
+        params.text += this.value;
     }
 }

package/dist/clauses/update.clause.js

@@ -13,9 +13,9 @@ export class UpdateClause extends Clause {
             throw new Error('Update clause has no data to update. All values are `undefined`');
         entries.forEach(([key, value], index) => {
             if (index)
-                params.text.push(', ');
+                params.text += ', ';
             params.args.push(value);
-            params.text.push(`${key} = $${params.args.length}`);
+            params.text += `${key} = $${params.args.length}`;
         });
     }
 }

package/dist/clauses/where.clause.js

@@ -13,9 +13,9 @@ export class WhereClause extends Clause {
             throw new Error('Where clause has no data to update. All values are `undefined`');
         entries.forEach(([key, value], index) => {
             if (index)
-                params.text.push(' AND ');
+                params.text += ' AND ';
             params.args.push(value);
-            params.text.push(`"${key}" = $${params.args.length}`);
+            params.text += `"${key}" = $${params.args.length}`;
         });
     }
 }

package/dist/connection.d.ts

@@ -12,6 +12,8 @@ export type ConnectionParams = {
     logLevel?: LogLevel;
     int8toBigint?: boolean;
     queryTimeout?: number;
+    batchCapacity?: number;
+    flushShedule?: "nextTick" | "Immediate";
 };
 export type StatementName = Branded<string, 'StatementName'>;
 export type QueryText = Branded<string, 'QueryText'>;
@@ -53,7 +55,7 @@ export declare class Connection {
     private _isReconnecting;
     private _socket;
     private _writer;
-    private _pipelinesQueue;
+    private _batchQueue;
     private _described;
     private _describingPending;
     private _parsed;

package/dist/connection.d.ts.map

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

package/dist/connection.js

@@ -1,14 +1,17 @@
+import { nextTick } from "process";
 import { ConnectionRequestWriter } from "./protocol/connection-request-writer";
 import { createAuthorizedSocket } from "./protocol/socket-authorization";
 import { ResponseTypes } from "./protocol/constants";
 import { compileSqlTemplate } from "./utils/template-compiler";
 import { Transaction } from "./transaction";
 import { SocketConnector } from "./protocol/socket-connector";
-import { Queue } from "./queue";
+import { Queue, RingQueue } from "./queue";
 import { Query, QueryState, StreamQuery } from "./query";
 import { sql } from ".";
 import { Begin, Future, Ok } from 'fluent-future';
 import { PostgresError } from "./error";
+const ErrBatchOverflowed = new PostgresError(`BatchOverflowError: Connection queue capacity exceeded.
+    Please increase the batch capacity parameter in your connection config.`);
 const ErrConnectionClosed = new PostgresError("Connection is closed", 'connection_closed', "", "ERROR");
 const ErrConnectionReconnecring = new PostgresError("Connection are reconnecting", "connection_reconnecting", "", "ERROR");
 /**
@@ -53,7 +56,7 @@ export class Connection {
         this._isFlushing = false;
         this._isOpened = true;
         this._isReconnecting = false;
-        this._pipelinesQueue = new Queue();
+        this._batchQueue = new Queue();
         this._described = new Map();
         this._describingPending = new Set();
         this._parsed = new Map();
@@ -117,13 +120,13 @@ export class Connection {
      */
     query(templates, ...params) {
         this._checkOpened();
-        this._registerFlush();
-        const { text, args } = compileSqlTemplate({ templates, args: params });
+        const { text, args } = compileSqlTemplate(templates, params);
         if (this._logLevel === 'query') {
             console.log(`\nQUERY:     ${text}\n${args.length !== 0 ? `ARGUMENTS: [${args}]\n` : ""}`);
         }
         const query = this._createQuery(text, args);
-        this._writeQuery(query);
+        if (this._writeQuery(query))
+            return Future.reject(ErrBatchOverflowed);
         query.startTimeout(this.params.queryTimeout || 30000);
         return query.future;
     }
@@ -249,8 +252,7 @@ export class Connection {
      */
     stream(templates, ...params) {
         this._checkOpened();
-        this._registerFlush();
-        const { text, args } = compileSqlTemplate({ templates, args: params });
+        const { text, args } = compileSqlTemplate(templates, params);
         if (this._logLevel === 'query') {
             console.log(`\nQUERY:     ${text}\n${args.length !== 0 ? `ARGUMENTS: [${args}]\n` : ""}`);
         }
@@ -261,19 +263,20 @@ export class Connection {
             }
         });
         const query = this._createStream(text, args, controller);
-        this._writeQuery(query);
+        if (this._writeQuery(query))
+            throw ErrBatchOverflowed;
         query.startTimeout(this.params.queryTimeout || 30000);
         return stream;
     }
     _streamWithController(templates, params, controller) {
         this._checkOpened();
-        this._registerFlush();
-        const { text, args } = compileSqlTemplate({ templates, args: params });
+        const { text, args } = compileSqlTemplate(templates, params);
         if (this._logLevel === 'query') {
             console.log(`\nQUERY:     ${text}\n${args.length !== 0 ? `ARGUMENTS: [${args}]\n` : ""}`);
         }
         const query = this._createStream(text, args, controller);
-        this._writeQuery(query);
+        if (this._writeQuery(query))
+            throw ErrBatchOverflowed;
         query.startTimeout(this.params.queryTimeout || 30000);
         return query;
     }
@@ -336,34 +339,34 @@ export class Connection {
         }
     }
     _writeQuery(query) {
+        const batch = this._registerFlush();
+        if (batch.isFull)
+            return true;
+        batch.push(query);
         if (query.state === QueryState.Parsing) {
             this._writer
                 .writeParse(query.statementName, query.text)
-                .writeDescribe(query.statementName)
-                .writeBind("", query.statementName, query.args)
-                .writeExecute("");
+                .writeDescribe(query.statementName);
         }
         if (query.state === QueryState.Describing) {
             this._writer
-                .writeDescribe(query.statementName)
-                .writeBind("", query.statementName, query.args)
-                .writeExecute("");
+                .writeDescribe(query.statementName);
         }
-        if (query.state === QueryState.Executing) {
-            this._writer
-                .writeBind("", query.statementName, query.args)
-                .writeExecute("");
-        }
-        this._pipelinesQueue.last.push(query);
+        this._writer
+            .writeBind("", query.statementName, query.args)
+            .writeExecute("");
     }
     _registerFlush() {
         if (!this._isFlushing) {
             this._isFlushing = true;
-            this._pipelinesQueue.push(new Queue());
-            setImmediate(() => {
-                this._flush();
-            });
+            const batch = new RingQueue(this.params.batchCapacity);
+            this._batchQueue.push(batch);
+            this.params.flushShedule === 'nextTick'
+                ? nextTick(() => this._flush())
+                : setImmediate(() => this._flush());
+            return batch;
         }
+        return this._batchQueue.last;
     }
     _flush() {
         if (!this._isOpened) {
@@ -372,15 +375,15 @@ export class Connection {
         }
         if (this._isReconnecting) {
             this._reconnect().then(() => {
-                this._isFlushing = false;
                 this._socket.write(this._writer.writeSync());
                 this._writer.clear();
+                this._isFlushing = false;
             });
         }
         else {
-            this._isFlushing = false;
             this._socket.write(this._writer.writeSync());
             this._writer.clear();
+            this._isFlushing = false;
         }
     }
     _registerReconnect() {
@@ -396,6 +399,7 @@ export class Connection {
         this._rejectPipeline(cause);
     }
     async _reconnect() {
+        console.log('reconnecting');
         this._resetConnectionState(ErrConnectionReconnecring);
         const socket = await createAuthorizedSocket(ConnectionRequestWriter.new(), this.params);
         const connector = new SocketConnector(socket, (type, _, reader) => this._handlePacket(type, reader), (err) => this._registerReconnect());
@@ -412,12 +416,12 @@ export class Connection {
         return Promise.all(promises);
     }
     _getCurrentQuery() {
-        return this._pipelinesQueue.current.current;
+        return this._batchQueue.current.current;
     }
     _rejectPipeline(error) {
-        if (this._pipelinesQueue.isFree)
+        if (this._batchQueue.isFree)
             return;
-        const queue = this._pipelinesQueue.current;
+        const queue = this._batchQueue.current;
         while (queue.hasMore) {
             queue.shift.reject(error);
         }
@@ -480,7 +484,7 @@ export class Connection {
             case ResponseTypes.ComandComplete:
                 {
                     reader.readCommandComplete();
-                    if (this._pipelinesQueue.isFree) {
+                    if (this._batchQueue.isFree) {
                         this.close();
                         break;
                     }
@@ -490,7 +494,7 @@ export class Connection {
                         break;
                     }
                     query.state = QueryState.Completed;
-                    this._pipelinesQueue.current.next();
+                    this._batchQueue.current.next();
                     query.resolve();
                 }
                 break;
@@ -516,7 +520,7 @@ export class Connection {
             case ResponseTypes.ReadyForQuery:
                 {
                     reader.readReadyForQuery();
-                    this._pipelinesQueue.next();
+                    this._batchQueue.next();
                 }
                 break;
             case ResponseTypes.Notice:
@@ -559,9 +563,9 @@ export class Connection {
     close() {
         this._isOpened = false;
         this._socket.destroy();
-        while (this._pipelinesQueue.hasMore) {
+        while (this._batchQueue.hasMore) {
             this._rejectPipeline(ErrConnectionClosed);
-            this._pipelinesQueue.next();
+            this._batchQueue.next();
         }
     }
 }

package/dist/queue.d.ts

@@ -10,4 +10,21 @@ export declare class Queue<T> {
     get hasMore(): boolean;
     get isFree(): boolean;
 }
+export declare class RingQueue<T> {
+    private readonly _queue;
+    private readonly _mask;
+    private _head;
+    private _tail;
+    private _size;
+    constructor(requestedCapacity?: number);
+    next(): void;
+    get current(): T;
+    get last(): T;
+    get shift(): T;
+    push(item: T): void;
+    get size(): number;
+    get hasMore(): boolean;
+    get isFree(): boolean;
+    get isFull(): boolean;
+}
 //# sourceMappingURL=queue.d.ts.map

package/dist/queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"AAAA,qBAAa,KAAK,CAAC,CAAC;IAChB,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,QAAQ,CAAI;IAEpB,IAAI;IAcJ,IAAI,OAAO,MAEV;IAED,IAAI,IAAI,MAA+C;IAGvD,IAAI,KAAK,MAKR;IAGD,IAAI,CAAC,IAAI,EAAE,CAAC;IAIZ,IAAI,IAAI,WAEP;IAGD,IAAI,OAAO,YAEV;IAGD,IAAI,MAAM,YAA+C;CAC5D"}
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"AAAA,qBAAa,KAAK,CAAC,CAAC;IAChB,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,QAAQ,CAAI;IAEpB,IAAI;IAUJ,IAAI,OAAO,MAEV;IAED,IAAI,IAAI,MAA+C;IAGvD,IAAI,KAAK,MAKR;IAGD,IAAI,CAAC,IAAI,EAAE,CAAC;IAIZ,IAAI,IAAI,WAEP;IAGD,IAAI,OAAO,YAEV;IAGD,IAAI,MAAM,YAA+C;CAC5D;AAID,qBAAa,SAAS,CAAC,CAAC;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAK;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAE9B,OAAO,CAAC,KAAK,CAAI;IACjB,OAAO,CAAC,KAAK,CAAI;IACjB,OAAO,CAAC,KAAK,CAAI;gBAEL,iBAAiB,SAAQ;IAOrC,IAAI;IAMJ,IAAI,OAAO,MAEV;IAED,IAAI,IAAI,MAEP;IAED,IAAI,KAAK,MAIR;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;IAMZ,IAAI,IAAI,WAEP;IAED,IAAI,OAAO,YAEV;IAED,IAAI,MAAM,YAET;IAED,IAAI,MAAM,YAET;CACJ"}

package/dist/queue.js

@@ -4,11 +4,8 @@ export class Queue {
         this._pointer = 0;
     }
     next() {
+        this._queue[this._pointer] = undefined;
         this._pointer++;
-        if (this._pointer > 10000) {
-            this._queue.splice(0, this._pointer);
-            this._pointer = 0;
-        }
         if (this._pointer >= this._queue.length) {
             this._queue.length = 0;
             this._pointer = 0;
@@ -34,3 +31,46 @@ export class Queue {
     }
     get isFree() { return this._pointer >= this._queue.length; }
 }
+export class RingQueue {
+    constructor(requestedCapacity = 20000) {
+        this._head = 0;
+        this._tail = 0;
+        this._size = 0;
+        const capacity = 2 ** Math.ceil(Math.log2(requestedCapacity));
+        this._queue = new Array();
+        this._mask = capacity - 1;
+    }
+    next() {
+        this._queue[this._head] = undefined;
+        this._head = (this._head + 1) & this._mask;
+        this._size--;
+    }
+    get current() {
+        return this._queue[this._head];
+    }
+    get last() {
+        return this._queue[(this._tail - 1) & this._mask];
+    }
+    get shift() {
+        const item = this.current;
+        this.next();
+        return item;
+    }
+    push(item) {
+        this._queue[this._tail] = item;
+        this._tail = (this._tail + 1) & this._mask;
+        this._size++;
+    }
+    get size() {
+        return this._size;
+    }
+    get hasMore() {
+        return this._size !== 0;
+    }
+    get isFree() {
+        return this._size === 0;
+    }
+    get isFull() {
+        return this._size === this._mask + 1;
+    }
+}

package/dist/transaction.d.ts

@@ -17,11 +17,11 @@ export declare class Transaction {
     /**
      * Commits the current transaction.
      */
-    commit(): Future<void, any>;
+    commit(): Future<Record<string, any>[], any>;
     /**
      * Rolls back the current transaction.
      */
-    rollback(): Future<void, any>;
+    rollback(): Future<Record<string, any>[], any>;
     /**
      * Executes a query within the current transaction.
      */

package/dist/transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC;;;GAGG;AACH,qBAAa,WAAW;IAIhB,QAAQ,CAAC,IAAI,EAAE,UAAU;IAH7B,OAAO,CAAC,UAAU,CAAiB;gBAGtB,IAAI,EAAE,UAAU;IAG7B;;OAEG;IACH,IAAW,QAAQ,IAAI,OAAO,CAE7B;IAED,OAAO,CAAC,WAAW;IAMnB;;OAEG;IACI,MAAM;IAQb;;OAEG;IACI,QAAQ;IAQf;;OAEG;IACI,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAK3F;;;;;;;;;OASG;IACI,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC;CAWjG"}
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC;;;GAGG;AACH,qBAAa,WAAW;IAIhB,QAAQ,CAAC,IAAI,EAAE,UAAU;IAH7B,OAAO,CAAC,UAAU,CAAiB;gBAGtB,IAAI,EAAE,UAAU;IAG7B;;OAEG;IACH,IAAW,QAAQ,IAAI,OAAO,CAE7B;IAED,OAAO,CAAC,WAAW;IAMnB;;OAEG;IACI,MAAM;IAOb;;OAEG;IACI,QAAQ;IAOf;;OAEG;IACI,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAK3F;;;;;;;;;OASG;IACI,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC;CAWjG"}

package/dist/transaction.js

@@ -26,8 +26,7 @@ export class Transaction {
     commit() {
         this.checkActive();
         return this.conn.query `COMMIT`
-            .tap(() => { this.isFinished = true; })
-            .map(() => { });
+            .tap(() => this.isFinished = true);
     }
     /**
      * Rolls back the current transaction.
@@ -35,8 +34,7 @@ export class Transaction {
     rollback() {
         this.checkActive();
         return this.conn.query `ROLLBACK`
-            .tap(() => { this.isFinished = true; })
-            .map(() => { });
+            .tap(() => this.isFinished = true);
     }
     /**
      * Executes a query within the current transaction.

package/dist/types.d.ts

@@ -9,7 +9,7 @@ export type CompiledSqlQuery = {
     args: (string | null)[];
 };
 export type ClauseStrategyParams = {
-    text: string[];
+    text: string;
     args: any[];
 };
 export type CompileSQLParams = {

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,GAAG,EAAE,OAAO,SAAS,GAAG,EAAE,IAAI;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;CACpD,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;CAC3B,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IAC/B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,GAAG,EAAE,CAAC;CACf,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC3B,SAAS,EAAE,oBAAoB,CAAC;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;CACf,CAAA;AAGD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,GAAG;IAAC,OAAO,EAAE,KAAK,CAAA;CAAC,CAAA;AAEpD,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,GAAG,EAAE,OAAO,SAAS,GAAG,EAAE,IAAI;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;CACpD,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;CAC3B,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;CACf,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC3B,SAAS,EAAE,oBAAoB,CAAC;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;CACf,CAAA;AAGD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,GAAG;IAAC,OAAO,EAAE,KAAK,CAAA;CAAC,CAAA;AAEpD,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA"}

package/dist/utils/template-compiler.d.ts

@@ -1,3 +1,3 @@
-import { CompiledSqlQuery, CompileSQLParams } from "../types";
-export declare function compileSqlTemplate(params: Readonly<CompileSQLParams>, argOffset?: number): CompiledSqlQuery;
+import { CompiledSqlQuery } from "../types";
+export declare function compileSqlTemplate(templates: TemplateStringsArray, args: unknown[], argOffset?: number): CompiledSqlQuery;
 //# sourceMappingURL=template-compiler.d.ts.map

package/dist/utils/template-compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-compiler.d.ts","sourceRoot":"","sources":["../../src/utils/template-compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAInF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,SAAI,GAAG,gBAAgB,CA+BtG"}
+{"version":3,"file":"template-compiler.d.ts","sourceRoot":"","sources":["../../src/utils/template-compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,gBAAgB,EAAoB,MAAM,UAAU,CAAA;AAInF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,SAAS,SAAI,GAAG,gBAAgB,CAoCpH"}

package/dist/utils/template-compiler.js

@@ -1,15 +1,19 @@
 import { Clause } from "../clauses/abstract.clause";
-export function compileSqlTemplate(params, argOffset = 0) {
-    const templateLength = params.templates.length;
+const cache = new WeakMap();
+export function compileSqlTemplate(templates, args, argOffset = 0) {
+    const cached = cache.get(templates);
+    if (cached)
+        return { args: args.map(prepareValue), text: cached };
+    const templateLength = templates.length;
     const query = {
-        text: [],
+        text: '',
         args: [],
     };
-    params.templates.forEach((template, index) => {
-        query.text.push(template);
+    templates.forEach((template, index) => {
+        query.text += template;
         if (index === templateLength - 1)
             return;
-        const value = params.args[index];
+        const value = args[index];
         if (value instanceof Clause) {
             value.mapIntoQuery(query);
         }
@@ -19,10 +23,11 @@ export function compileSqlTemplate(params, argOffset = 0) {
                     Use null if you want NULL in SQL, or ensure the value is defined.`);
             }
             query.args.push(value);
-            query.text.push(`$${query.args.length + argOffset}`);
+            query.text += `$${query.args.length + argOffset}`;
         }
     });
-    return { args: query.args.map(prepareValue), text: query.text.join('') };
+    !args.some(value => value instanceof Clause) && cache.set(templates, query.text);
+    return { args: query.args.map(prepareValue), text: query.text };
 }
 const prepareValue = (value) => {
     if (value === null || value === undefined) {
@@ -54,7 +59,7 @@ const prepareValue = (value) => {
         }
         return prepareObject(value);
     }
-    return value.toString();
+    return String(value);
 };
 const prepareObject = (obj) => {
     if (obj && typeof obj.toPG === 'function') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m2k-5f/pgtx",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "type": "module",
   "description": "Blazing-fast PostgreSQL driver with pipeline support.",
   "files": [
@@ -16,11 +16,13 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/M2K-5F/pgtx.git"
+    "url": "git://github.com/M2Kc-s4/pgtx.git"
   },
   "keywords": [
     "sql",
     "postgres",
+    "blazing",
+    "stream",
     "driver",
     "pipeline",
     "query-builder",
@@ -28,11 +30,11 @@
     "transactions",
     "prepared-statements"
   ],
-  "author": "M2K-5F",
+  "author": "M2Kc-s4",
   "license": "MIT",
-  "homepage": "https://github.com/M2K-5F/pgtx",
+  "homepage": "https://github.com/M2Kc-s4/pgtx",
   "bugs": {
-    "url": "https://github.com/M2K-5F/pgtx/issues"
+    "url": "https://github.com/M2Kc-s4/pgtx/issues"
   },
   "exports": {
     ".": {