@m2k-5f/pgtx 2.8.0 → 2.8.2

package/dist/transaction.js

@@ -1,6 +1,7 @@
 import { Begin, Future } from "fluent-future";
 import { IdentifierClause } from "./clauses";
-import { ErrTransactionClosed } from "./error";
+import { ErrConnectionClosed, ErrTransactionClosed } from "./error";
+import { compileSqlTemplate } from "./utils";
 /**
  * Represents an active SQL transaction.
  * All queries are executed on a single dedicated connection.
@@ -20,29 +21,36 @@ export class Transaction {
      * Commits the current transaction.
      */
     commit() {
-        if (this.isFinished)
-            return Future.reject(ErrTransactionClosed);
-        return this.conn.query `COMMIT`
-            .tap(() => this.isFinished = true)
-            .map(() => { });
+        return this.execute `COMMIT`
+            .tap(() => this.isFinished = true);
     }
     /**
      * Rolls back the current transaction.
      */
     rollback() {
-        if (this.isFinished)
-            return Future.reject(ErrTransactionClosed);
-        return this.conn.query `ROLLBACK`
-            .tap(() => this.isFinished = true)
-            .map(() => { });
+        return this.execute `ROLLBACK`
+            .tap(() => this.isFinished = true);
     }
     /**
      * Executes a query within the current transaction.
      */
-    query(strings, ...values) {
-        if (this.isFinished)
+    query(templates, ...params) {
+        if (this.isFinished) {
+            this.conn['_logError'](ErrTransactionClosed);
             return Future.reject(ErrTransactionClosed);
-        return this.conn.query(strings, ...values);
+        }
+        if (this.conn.isClosed) {
+            this.conn['_logError'](ErrConnectionClosed);
+            return Future.reject(ErrConnectionClosed);
+        }
+        const { text, args } = compileSqlTemplate(templates, params);
+        const resolvers = Future.withResolvers();
+        if (this.conn['_reconnecting']) {
+            return this.conn['_reconnecting']
+                .tapErr(err => this.conn['_logError'](err))
+                .andThen(() => this.conn['_performQuery'](text, args, resolvers));
+        }
+        return this.conn['_performQuery'](text, args, resolvers);
     }
     /**
      * Like {@link query}, but for statements that don't return rows (INSERT/UPDATE/DDL/etc).
@@ -50,10 +58,59 @@ export class Transaction {
      * @example
      * await tx.execute`UPDATE users SET name = ${name} WHERE id = ${id}`
      */
-    execute(strings, ...params) {
-        if (this.isFinished)
+    execute(templates, ...params) {
+        if (this.isFinished) {
+            this.conn['_logError'](ErrTransactionClosed);
             return Future.reject(ErrTransactionClosed);
-        return this.conn.execute(strings, ...params);
+        }
+        if (this.conn.isClosed) {
+            this.conn['_logError'](ErrConnectionClosed);
+            return Future.reject(ErrConnectionClosed);
+        }
+        const { text, args } = compileSqlTemplate(templates, params);
+        const resolvers = Future.withResolvers();
+        if (this.conn['_reconnecting']) {
+            return this.conn['_reconnecting']
+                .tapErr(err => this.conn['_logError'](err))
+                .andThen(() => this.conn['_performExecute'](text, args, resolvers));
+        }
+        return this.conn['_performExecute'](text, args, resolvers);
+    }
+    /**
+     * Streams query results as a `ReadableStream`, without buffering rows in memory.
+     * Ideal for large result sets or piping straight into an HTTP response.
+     *
+     * @example
+     * for await (const row of conn.stream<User>`SELECT * FROM orders`) { ... }
+     */
+    stream(templates, ...params) {
+        if (this.isFinished) {
+            this.conn['_logError'](ErrTransactionClosed);
+            throw ErrTransactionClosed;
+        }
+        if (this.conn.isClosed) {
+            this.conn['_logError'](ErrConnectionClosed);
+            throw ErrConnectionClosed;
+        }
+        const { text, args } = compileSqlTemplate(templates, params);
+        let controller;
+        const stream = new ReadableStream({
+            start: c => {
+                controller = c;
+            }
+        });
+        if (this.conn['_reconnecting']) {
+            this.conn['_reconnecting']
+                .tap(() => this.conn['_performStream'](text, args, controller))
+                .tapErr(err => {
+                this.conn['_logError'](err);
+                controller.error(err);
+            })
+                .recover();
+            return stream;
+        }
+        this.conn['_performStream'](text, args, controller);
+        return stream;
     }
     /**
      * Creates a sub-transaction using PostgreSQL SAVEPOINT.
@@ -66,12 +123,10 @@ export class Transaction {
      * });
      */
     savepoint(name, callback) {
-        if (this.isFinished)
-            return Future.reject(ErrTransactionClosed);
         return Begin()
-            .andThen(() => this.conn.query `SAVEPOINT ${IdentifierClause.create(name)}`)
-            .andThen(() => Future.of(callback(this))
-            .tap(() => this.conn.query `RELEASE SAVEPOINT ${IdentifierClause.create(name)}`)
-            .tapErr(() => this.conn.query `ROLLBACK TO SAVEPOINT ${IdentifierClause.create(name)}`));
+            .andThen(() => this.query `SAVEPOINT ${IdentifierClause.create(name)}`)
+            .andThen(() => Future.of(() => callback(this))
+            .tap(() => this.query `RELEASE SAVEPOINT ${IdentifierClause.create(name)}`)
+            .tapErr(() => this.query `ROLLBACK TO SAVEPOINT ${IdentifierClause.create(name)}`));
     }
 }

package/dist/types.d.ts

@@ -29,7 +29,7 @@ export type ConnectionPartialConfig = {
     logLevel?: LogLevel;
     int8toBigint?: boolean;
     queryTimeout?: number;
-    syncShedule?: "beforeMicrotask" | "afterMicrotask" | "Immediate";
+    syncSсhedule?: "beforeMicrotask" | "afterMicrotask" | "Immediate";
     ssl?: SSLMode;
     caPath?: string;
 };
@@ -42,7 +42,7 @@ export type ConnectionConfig = {
     logLevel: LogLevel;
     int8toBigint: boolean;
     queryTimeout: number;
-    syncShedule: "beforeMicrotask" | "afterMicrotask" | "Immediate";
+    syncSсhedule: "beforeMicrotask" | "afterMicrotask" | "Immediate";
     ssl: SSLMode;
     caPath?: string;
 };

package/dist/types.d.ts.map

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

package/dist/utils.d.ts

@@ -3,6 +3,4 @@ export declare function compileSqlTemplate(templates: TemplateStringsArray, args
     args: unknown[];
     text: QueryText;
 };
-export declare function prepareObject(obj: any): string;
-export declare function prepareValue(value: unknown): string | null;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAA0C,SAAS,EAAE,MAAM,SAAS,CAAA;AAI3E,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,SAAS,SAAI;;UAGpD,SAAS;EAkCtD;AAGD,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAM9C;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CA0C1D"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,SAAS,EAAE,MAAM,SAAS,CAAA;AAIzD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,SAAS,SAAI;;UAGpD,SAAS;EA2BtD"}

package/dist/utils.js

@@ -18,10 +18,6 @@ export function compileSqlTemplate(templates, args, argOffset = 0) {
             value.mapIntoQuery(query);
         }
         else {
-            if (value === undefined) {
-                throw new TypeError(`Query parameter at position ${query.args.length + argOffset + 1} is undefined. 
-                    Use null if you want NULL in SQL, or ensure the value is defined.`);
-            }
             query.args.push(value);
             query.text += `$${query.args.length + argOffset}`;
         }
@@ -29,45 +25,3 @@ export function compileSqlTemplate(templates, args, argOffset = 0) {
     !args.some(value => value instanceof Clause) && cache.set(templates, query.text);
     return query;
 }
-export function prepareObject(obj) {
-    if (obj && typeof obj.toPG === "function") {
-        return JSON.stringify(obj.toPG());
-    }
-    return JSON.stringify(obj);
-}
-export function prepareValue(value) {
-    if (value === null || value === undefined) {
-        return null;
-    }
-    if (typeof value === "object") {
-        if (value instanceof Date) {
-            return value.toISOString();
-        }
-        if (Buffer.isBuffer(value) || value instanceof Uint8Array) {
-            return "\\x" + Buffer
-                .from(value.buffer, value.byteOffset, value.byteLength)
-                .toString("hex");
-        }
-        if (Array.isArray(value)) {
-            const elements = value.map(el => {
-                if (el === null || el === undefined)
-                    return "NULL";
-                if (typeof el === "boolean")
-                    return el ? "true" : "false";
-                if (typeof el === "object") {
-                    const res = prepareValue(el);
-                    return `"${res?.replace(/"/g, '\\"')}"`;
-                }
-                if (typeof el === "string") {
-                    return `"${el
-                        .replace(/\\/g, "\\\\")
-                        .replace(/"/g, '\\"')}"`;
-                }
-                return String(el);
-            });
-            return `{${elements.join(",")}}`;
-        }
-        return prepareObject(value);
-    }
-    return String(value);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m2k-5f/pgtx",
-  "version": "2.8.0",
+  "version": "2.8.2",
   "type": "module",
   "description": "Blazing-fast PostgreSQL driver with pipeline support.",
   "files": [