@faasjs/knex 1.4.1 → 1.4.2

package/dist/index.d.mts

@@ -29,9 +29,9 @@ declare class Knex implements Plugin {
      *
      * - Support 'commit' and 'rollback' event.
      */
-    transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: Knex$1.TransactionConfig, options?: {
+    transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult>, config?: Knex$1.TransactionConfig, options?: {
         trx?: Knex$1.Transaction;
-    }): Promise<TResult | void>;
+    }): Promise<TResult>;
     schema(): Knex$1.SchemaBuilder;
     quit(): Promise<void>;
 }
@@ -46,9 +46,9 @@ declare function query<TName extends Knex$1.TableNames>(table: TName): Knex$1.Qu
     _unionProps: never;
 }[]>;
 declare function query<TName extends {} = any, TResult = any[]>(table: string): Knex$1.QueryBuilder<TName, TResult>;
-declare function transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: Knex$1.TransactionConfig, options?: {
+declare function transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult>, config?: Knex$1.TransactionConfig, options?: {
     trx?: Knex$1.Transaction;
-}): Promise<TResult | void>;
-declare function raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<TResult>;
+}): Promise<TResult>;
+declare function raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<Knex$1.Raw<TResult>>;
 
 export { Knex, type KnexConfig, originKnex, query, raw, transaction, useKnex };

package/dist/index.d.ts

@@ -29,9 +29,9 @@ declare class Knex implements Plugin {
      *
      * - Support 'commit' and 'rollback' event.
      */
-    transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: Knex$1.TransactionConfig, options?: {
+    transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult>, config?: Knex$1.TransactionConfig, options?: {
         trx?: Knex$1.Transaction;
-    }): Promise<TResult | void>;
+    }): Promise<TResult>;
     schema(): Knex$1.SchemaBuilder;
     quit(): Promise<void>;
 }
@@ -46,9 +46,9 @@ declare function query<TName extends Knex$1.TableNames>(table: TName): Knex$1.Qu
     _unionProps: never;
 }[]>;
 declare function query<TName extends {} = any, TResult = any[]>(table: string): Knex$1.QueryBuilder<TName, TResult>;
-declare function transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: Knex$1.TransactionConfig, options?: {
+declare function transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult>, config?: Knex$1.TransactionConfig, options?: {
     trx?: Knex$1.Transaction;
-}): Promise<TResult | void>;
-declare function raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<TResult>;
+}): Promise<TResult>;
+declare function raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<Knex$1.Raw<TResult>>;
 
 export { Knex, type KnexConfig, originKnex, query, raw, transaction, useKnex };

package/dist/index.js

@@ -166,37 +166,40 @@ var Knex = class {
       throw Error(`[${this.name}] Client not initialized.`);
     if (options == null ? void 0 : options.trx)
       return scope(options.trx);
-    return this.adapter.transaction(async (trx) => {
-      const trxId = crypto.randomUUID();
-      try {
-        const result = await scope(trx);
-        this.logger.debug(
-          "[%s] [%s] query begin: %s",
-          this.name,
-          trxId,
-          "COMMIT;"
-        );
-        await trx.commit();
+    const trx = await this.adapter.transaction(config);
+    const trxId = crypto.randomUUID();
+    this.logger.debug("[%s] [%s] transaction begin", this.name, trxId);
+    try {
+      const result = await scope(trx);
+      if (trx.isCompleted()) {
         this.logger.debug(
-          "[%s] [%s] query done: %s",
+          "[%s] [%s] transaction has been finished in scope",
           this.name,
-          trxId,
-          "COMMIT;"
+          trxId
         );
-        trx.emit("commit");
         return result;
-      } catch (error) {
-        await trx.rollback(error);
-        this.logger.debug(
-          "[%s] [%s] query failed: %s",
-          this.name,
-          trxId,
-          "ROLLBACK;"
-        );
-        trx.emit("rollback", error);
-        throw error;
       }
-    }, config);
+      this.logger.debug("[%s] [%s] transaction begin commit", this.name, trxId);
+      await trx.commit();
+      this.logger.debug(
+        "[%s] [%s] transaction committed: %j",
+        this.name,
+        trxId,
+        result
+      );
+      trx.emit("commit");
+      return result;
+    } catch (error) {
+      await trx.rollback(error);
+      this.logger.error(
+        "[%s] [%s] transaction rollback: %s",
+        this.name,
+        trxId,
+        error
+      );
+      trx.emit("rollback", error);
+      throw error;
+    }
   }
   schema() {
     if (!this.adapter)

package/dist/index.mjs

@@ -160,37 +160,40 @@ var Knex = class {
       throw Error(`[${this.name}] Client not initialized.`);
     if (options == null ? void 0 : options.trx)
       return scope(options.trx);
-    return this.adapter.transaction(async (trx) => {
-      const trxId = randomUUID();
-      try {
-        const result = await scope(trx);
-        this.logger.debug(
-          "[%s] [%s] query begin: %s",
-          this.name,
-          trxId,
-          "COMMIT;"
-        );
-        await trx.commit();
+    const trx = await this.adapter.transaction(config);
+    const trxId = randomUUID();
+    this.logger.debug("[%s] [%s] transaction begin", this.name, trxId);
+    try {
+      const result = await scope(trx);
+      if (trx.isCompleted()) {
         this.logger.debug(
-          "[%s] [%s] query done: %s",
+          "[%s] [%s] transaction has been finished in scope",
           this.name,
-          trxId,
-          "COMMIT;"
+          trxId
         );
-        trx.emit("commit");
         return result;
-      } catch (error) {
-        await trx.rollback(error);
-        this.logger.debug(
-          "[%s] [%s] query failed: %s",
-          this.name,
-          trxId,
-          "ROLLBACK;"
-        );
-        trx.emit("rollback", error);
-        throw error;
       }
-    }, config);
+      this.logger.debug("[%s] [%s] transaction begin commit", this.name, trxId);
+      await trx.commit();
+      this.logger.debug(
+        "[%s] [%s] transaction committed: %j",
+        this.name,
+        trxId,
+        result
+      );
+      trx.emit("commit");
+      return result;
+    } catch (error) {
+      await trx.rollback(error);
+      this.logger.error(
+        "[%s] [%s] transaction rollback: %s",
+        this.name,
+        trxId,
+        error
+      );
+      trx.emit("rollback", error);
+      throw error;
+    }
   }
   schema() {
     if (!this.adapter)

package/package.json

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