feat: add support for tx options

Author: sam-artuso

packages/transactional-adapters/transactional-adapter-pg-promise/src/lib/transactional-adapter-pg-promise.ts

@@ -3,11 +3,13 @@ import { IDatabase, ITask } from 'pg-promise';
 
 export type PgPromiseDbOrTx = IDatabase<unknown> | ITask<unknown>;
 
+type TxOptions = Parameters<PgPromiseDbOrTx['tx']>[0];
+
 export interface PgPromiseTransactionalAdapterOptions {
     /**
      * The injection token for the pg-promise instance.
      */
-    pgPromiseInstanceToken: any;
+    dbInstanceToken: any;
 }
 
 export class TransactionalAdapterPgPromise
@@ -16,15 +18,21 @@ export class TransactionalAdapterPgPromise
     connectionToken: any;
 
     constructor(options: PgPromiseTransactionalAdapterOptions) {
-        this.connectionToken = options.pgPromiseInstanceToken;
+        this.connectionToken = options.dbInstanceToken;
     }
 
     optionsFactory = (pgPromiseDbOrTxInstance: PgPromiseDbOrTx) => ({
         wrapWithTransaction: async (
-            options: any, // FIXME
+            options: TxOptions | null,
             fn: (...args: any[]) => Promise<any>,
             setClient: (client?: PgPromiseDbOrTx) => void,
         ) => {
+            if (options) {
+                return pgPromiseDbOrTxInstance.tx(options, (tx) => {
+                    setClient(tx);
+                    return fn();
+                });
+            }
             return pgPromiseDbOrTxInstance.tx((tx) => {
                 setClient(tx);
                 return fn();

packages/transactional-adapters/transactional-adapter-pg-promise/test/transactional-adapter-pg-promise.spec.ts

@@ -10,9 +10,22 @@ import { PgPromiseDbOrTx, TransactionalAdapterPgPromise } from '../src';
 import pgPromise from 'pg-promise';
 import { execSync } from 'node:child_process';
 
+type UserRecord = { id: number; name: string; email: string };
+
 const PG_PROMISE = 'PG_PROMISE';
 
-type UserRecord = { id: number; name: string; email: string };
+const pgp = pgPromise();
+const db = pgp({
+    host: 'localhost',
+    user: 'postgres',
+    password: 'postgres',
+    database: 'postgres',
+});
+
+const { TransactionMode, isolationLevel } = pgp.txMode;
+const transactionMode = new TransactionMode({
+    tiLevel: isolationLevel.serializable,
+});
 
 @Injectable()
 class UserRepository {
@@ -52,9 +65,7 @@ class UserService {
         return { r1, r2 };
     }
 
-    @Transactional<TransactionalAdapterPgPromise>({
-        isolationLevel: 'serializable', // FIXME
-    })
+    @Transactional<TransactionalAdapterPgPromise>({ mode: transactionMode })
     async transactionWithDecoratorWithOptions() {
         const r1 = await this.userRepository.createUser('James');
         const r2 = await this.db.oneOrNone<UserRecord>(
@@ -67,9 +78,7 @@ class UserService {
 
     async transactionWithFunctionWrapper() {
         return this.txHost.withTransaction(
-            {
-                isolationLevel: 'serializable',
-            },
+            { mode: transactionMode },
             async () => {
                 const r1 = await this.userRepository.createUser('Joe');
                 const r2 = await this.db.oneOrNone<UserRecord>(
@@ -89,14 +98,6 @@ class UserService {
     }
 }
 
-const pgp = pgPromise();
-const db = pgp({
-    host: 'localhost',
-    user: 'postgres',
-    password: 'postgres',
-    database: 'postgres',
-});
-
 @Module({
     providers: [
         {
@@ -116,7 +117,7 @@ class PgPromiseModule {}
                 new ClsPluginTransactional({
                     imports: [PgPromiseModule],
                     adapter: new TransactionalAdapterPgPromise({
-                        pgPromiseInstanceToken: PG_PROMISE,
+                        dbInstanceToken: PG_PROMISE,
                     }),
                 }),
             ],