@devmoods/express-extras 0.54.0 → 0.54.1

package/dist/postgres.d.ts

@@ -1,4 +1,5 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
+import { type RequestHandler } from 'express';
 import pg, { type PoolClient, type PoolConfig, type QueryResult, type QueryResultRow } from 'pg';
 import { type SqlStatement } from './sql.js';
 export declare const escapePostgresIdentifier: typeof pg.escapeIdentifier;
@@ -31,7 +32,7 @@ export declare class Connection {
     private options;
     client: PoolClient;
     constructor(client: PoolClient, options: ConnectionOptions);
-    private onLogStatement;
+    private logStatement;
     query<T extends QueryResultRow>(text: string | SqlStatement, values?: Value[]): Promise<QueryResult<T>>;
     all<T extends QueryResultRow>(text: string | SqlStatement, values?: Value[]): Promise<T[]>;
     insert<T extends QueryResultRow>(text: string | SqlStatement, values?: Value[]): Promise<QueryResult<T>>;
@@ -66,4 +67,5 @@ export declare function createPostgres({ onError, url, ...postgresOptions }?: Po
     clear: (force?: boolean) => Promise<void>;
     end(): Promise<void>;
 };
+export declare function withTransaction(postgres: ReturnType<typeof createPostgres>): RequestHandler;
 export {};

package/dist/postgres.js

@@ -1,4 +1,5 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
+import {} from 'express';
 import pg, {} from 'pg';
 import { config } from './config.js';
 import { formatSql } from './sql.js';
@@ -29,7 +30,7 @@ export class Connection {
         this.options = options;
         this.client = client;
     }
-    onLogStatement(text, values, duration) {
+    logStatement(text, values, duration) {
         if (this.options.onLogStatement) {
             return this.options.onLogStatement(text, values, duration);
         }
@@ -49,7 +50,7 @@ export class Connection {
             throw error;
         }
         finally {
-            this.onLogStatement?.(text, values, timer.getDuration());
+            this.logStatement?.(text, values, timer.getDuration());
         }
     }
     async all(text, values) {
@@ -166,11 +167,11 @@ export function createPostgres({ onError, url = config.value.POSTGRES_URL, ...po
         }
         // Start a new top-level transaction
         const client = await pool.connect();
+        const txConnection = new Transaction(client, {
+            onLogStatement: postgresOptions.onLogStatement,
+        });
         try {
-            await client.query('BEGIN');
-            const txConnection = new Transaction(client, {
-                onLogStatement: postgresOptions.onLogStatement,
-            });
+            await txConnection.query('BEGIN');
             // Create transaction context
             const txContext = {
                 connection: txConnection,
@@ -182,12 +183,12 @@ export function createPostgres({ onError, url = config.value.POSTGRES_URL, ...po
             const result = await transactionStorage.run(txContext, async () => {
                 return await callback();
             });
-            await client.query('COMMIT');
+            await txConnection.query('COMMIT');
             txContext.isCommitted = true;
             return result;
         }
         catch (error) {
-            await client.query('ROLLBACK');
+            await txConnection.query('ROLLBACK');
             throw error;
         }
         finally {
@@ -243,3 +244,19 @@ export function createPostgres({ onError, url = config.value.POSTGRES_URL, ...po
         },
     };
 }
+export function withTransaction(postgres) {
+    return async (req, res, next) => {
+        try {
+            await postgres.transaction(async () => {
+                await new Promise((resolve, reject) => {
+                    res.on('finish', resolve);
+                    res.on('error', reject);
+                    next();
+                });
+            });
+        }
+        catch (error) {
+            next(error);
+        }
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.54.0",
+  "version": "0.54.1",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",