egg-sequelize-autotrx - npm Package Compare versions

Comparing version 0.0.21 to 0.0.22

app/middleware/transaction.js

@@ -34,10 +34,18 @@ module.exports = (options, app) => async (ctx, next) => {
     const oldTrx = model.transaction
-    model.transaction = async task => {
-      const transaction = namespace.get('transaction')
-      if (transaction) {
-        app.loggers.coreLogger.info(`[egg-sequelize-autotrx] ctx.[${delegate}].transaction call injected transaction method`)
-        return oldTrx.call(model, { transaction }, task)
+    model.transaction = async (...args) => {
+      if (args.length === 1) { // transaction(asyncTask)
+        const task = args[0]
+        const transaction = namespace.get('transaction')
+        if (transaction) {
+          app.loggers.coreLogger.info(`[egg-sequelize-autotrx] ctx.[${delegate}].transaction specified transaction`)
+          return oldTrx.call(model, { transaction }, task)
+        } else {
+          app.loggers.coreLogger.info(`[egg-sequelize-autotrx] ctx.[${delegate}].transaction no specified transaction`)
+          return oldTrx.call(model, task)
+        }
       } else {
-        app.loggers.coreLogger.info(`[egg-sequelize-autotrx] ctx.[${delegate}].transaction call original transaction method`)
-        return oldTrx.call(model, task)
+        // for example: transaction({ transaction }, asyncTask)
+        // will call original transaction function directly, without inject transaction in cls
+        app.loggers.coreLogger.info(`[egg-sequelize-autotrx] ctx.[${delegate}].transaction call original method`)
+        return oldTrx.call(model, ...args)
       }
@@ -44,0 +52,0 @@ }

package.json

 {
   "name": "egg-sequelize-autotrx",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Auto transaction based on cls-hooked for egg-sequelize plugin",
@@ -5,0 +5,0 @@ "eggPlugin": {

No alert changes

Improved metrics

Total package byte prevSize

12302

increased by3.6%

Lines of code

58

increased by16%

No dependency changes