vona-module-a-executor 5.0.16 → 5.0.18

package/dist/bean/bean.executor.d.ts

@@ -8,5 +8,6 @@ export declare class BeanExecutor extends BeanBase {
     newCtxIsolate<RESULT>(fn: FunctionAsync<RESULT>, options?: INewCtxOptions): Promise<RESULT>;
     mockCtx<RESULT>(fn: FunctionAsync<RESULT>, options?: INewCtxOptions): Promise<RESULT>;
     newCtx<RESULT>(fn: FunctionAsync<RESULT>, options?: INewCtxOptions): Promise<RESULT>;
-    private _newCtxInner;
+    private _newCtxInnerStep1;
+    private _newCtxInnerStep2;
 }

package/dist/index.js

@@ -77,12 +77,14 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
     return this.newCtx(fn, options);
   }
   async newCtx(fn, options) {
-    if (isNil(options?.dbInfo)) return this._newCtxInner(fn, options);
-    return this.bean.database.switchDb(() => {
-      return this._newCtxInner(fn, options);
-    }, options?.dbInfo);
+    return this._newCtxInnerStep1(() => {
+      if (isNil(options?.dbInfo)) return this._newCtxInnerStep2(fn, options);
+      return this.bean.database.switchDb(() => {
+        return this._newCtxInnerStep2(fn, options);
+      }, options?.dbInfo);
+    }, options);
   }
-  async _newCtxInner(fn, options) {
+  async _newCtxInnerStep1(fn, options) {
     options = Object.assign({}, options);
     // innerAccess
     const innerAccess = options.innerAccess !== false;
@@ -122,30 +124,33 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
           __delegateProperties(ctx, options.extraData);
         }
       }
-      // instance
-      const instanceName = ctx.instanceName; // use default instanceName when undefined
-      if (instanceName !== undefined && instanceName !== null) {
-        ctx.instance = await this.bean.instance.get(instanceName);
-        // start instance
-        if (options.instance) {
-          await this.$scope.instance.service.instance.checkAppReadyInstance(true);
-        }
-      }
-      // execute
-      let res;
-      if (options.transaction) {
-        res = await this.bean.database.current.transaction.begin(async () => {
-          return await fn();
-        }, options.transactionOptions);
-      } else {
-        res = await fn();
-      }
-      // commitsDone
-      await ctx.commitsDone();
-      // ok
-      return res;
+      return await fn();
     });
   }
+  async _newCtxInnerStep2(fn, options) {
+    // instance
+    const instanceName = this.ctx.instanceName; // use default instanceName when undefined
+    if (instanceName !== undefined && instanceName !== null) {
+      this.ctx.instance = await this.bean.instance.get(instanceName);
+      // start instance
+      if (options?.instance) {
+        await this.$scope.instance.service.instance.checkAppReadyInstance(true);
+      }
+    }
+    // execute
+    let res;
+    if (options?.transaction) {
+      res = await this.bean.database.current.transaction.begin(async () => {
+        return await fn();
+      }, options?.transactionOptions);
+    } else {
+      res = await fn();
+    }
+    // commitsDone
+    await this.ctx.commitsDone();
+    // ok
+    return res;
+  }
 }) || _class$2) || _class$2);
 
 function _applyDecoratedDescriptor(i, e, r, n, l) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-executor",
   "type": "module",
-  "version": "5.0.16",
+  "version": "5.0.18",
   "title": "a-executor",
   "vonaModule": {
     "dependencies": {}