@faasjs/knex 1.3.1 → 1.4.0

package/dist/index.d.mts

@@ -24,6 +24,11 @@ declare class Knex implements Plugin {
     onMount(data: MountData, next: Next): Promise<void>;
     onInvoke(data: InvokeData<any, any, any>, next: Next): Promise<void>;
     raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<Knex$1.Raw<TResult>>;
+    /**
+     * Wraps a transaction, returning a promise that resolves to the return value of the callback.
+     *
+     * - Support 'commit' and 'rollback' event.
+     */
     transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: Knex$1.TransactionConfig, options?: {
         trx?: Knex$1.Transaction;
     }): Promise<TResult | void>;

package/dist/index.d.ts

@@ -24,6 +24,11 @@ declare class Knex implements Plugin {
     onMount(data: MountData, next: Next): Promise<void>;
     onInvoke(data: InvokeData<any, any, any>, next: Next): Promise<void>;
     raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<Knex$1.Raw<TResult>>;
+    /**
+     * Wraps a transaction, returning a promise that resolves to the return value of the callback.
+     *
+     * - Support 'commit' and 'rollback' event.
+     */
     transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: Knex$1.TransactionConfig, options?: {
         trx?: Knex$1.Transaction;
     }): Promise<TResult | void>;

package/dist/index.js

@@ -146,12 +146,28 @@ var Knex = class {
       throw Error("[Knex] Client not initialized.");
     return this.adapter.raw(sql, bindings);
   }
+  /**
+   * Wraps a transaction, returning a promise that resolves to the return value of the callback.
+   *
+   * - Support 'commit' and 'rollback' event.
+   */
   async transaction(scope, config, options) {
     if (!this.adapter)
       throw Error(`[${this.name}] Client not initialized.`);
     if (options == null ? void 0 : options.trx)
       return scope(options.trx);
-    return this.adapter.transaction(scope, config);
+    return this.adapter.transaction(async (trx) => {
+      try {
+        const result = await scope(trx);
+        await trx.commit();
+        trx.emit("commit");
+        return result;
+      } catch (error) {
+        await trx.rollback(error);
+        trx.emit("rollback", error);
+        throw error;
+      }
+    }, config);
   }
   schema() {
     if (!this.adapter)

package/dist/index.mjs

@@ -140,12 +140,28 @@ var Knex = class {
       throw Error("[Knex] Client not initialized.");
     return this.adapter.raw(sql, bindings);
   }
+  /**
+   * Wraps a transaction, returning a promise that resolves to the return value of the callback.
+   *
+   * - Support 'commit' and 'rollback' event.
+   */
   async transaction(scope, config, options) {
     if (!this.adapter)
       throw Error(`[${this.name}] Client not initialized.`);
     if (options == null ? void 0 : options.trx)
       return scope(options.trx);
-    return this.adapter.transaction(scope, config);
+    return this.adapter.transaction(async (trx) => {
+      try {
+        const result = await scope(trx);
+        await trx.commit();
+        trx.emit("commit");
+        return result;
+      } catch (error) {
+        await trx.rollback(error);
+        trx.emit("rollback", error);
+        throw error;
+      }
+    }, config);
   }
   schema() {
     if (!this.adapter)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/knex",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,9 +21,9 @@
     "dist"
   ],
   "dependencies": {
-    "@faasjs/deep_merge": "1.3.1",
-    "@faasjs/func": "1.3.1",
-    "@faasjs/logger": "1.3.1"
+    "@faasjs/deep_merge": "1.4.0",
+    "@faasjs/func": "1.4.0",
+    "@faasjs/logger": "1.4.0"
   },
   "peerDependencies": {
     "knex": "*"