vona-module-a-executor 5.0.14 → 5.0.16

package/dist/.metadata/index.d.ts

@@ -28,6 +28,10 @@ declare module 'vona-module-a-bean' {
 declare module 'vona-module-a-executor' {
     interface ServiceExecutor {
     }
+    interface ServiceExecutor {
+        get $beanFullName(): 'a-executor.service.executor';
+        get $onionName(): 'a-executor:executor';
+    }
 }
 /** service: end */
 /** service: begin */

package/dist/index.js

@@ -1,6 +1,6 @@
 import { BeanInfo, BeanBase, cast, deepExtend, BeanScopeBase } from 'vona';
+import { isNil, combineParamsAndQuery } from '@cabloy/utils';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
-import { combineParamsAndQuery } from '@cabloy/utils';
 import { Aspect } from 'vona-module-a-aspect';
 
 function __delegateProperties(ctx, ctxCaller) {
@@ -58,7 +58,7 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
     return await this.scope.service.executor.performActionInner(method, url, options);
   }
   runInBackground(fn) {
-    return this.bean.database.newDbIsolate(() => {
+    return this.bean.database.switchDbIsolate(() => {
       return this.newCtx(fn);
     });
   }
@@ -70,16 +70,17 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
   }
   async mockCtx(fn, options) {
     options = Object.assign({}, options);
-    options.dbInfo = options.dbInfo === undefined ? true : options.dbInfo;
+    options.dbInfo = isNil(options.dbInfo) ? {
+      level: 1
+    } : options.dbInfo;
     options.instanceName = options.instanceName === undefined ? this.ctx?.instanceName ?? '' : options.instanceName;
     return this.newCtx(fn, options);
   }
   async newCtx(fn, options) {
-    if (!options?.dbInfo) return this._newCtxInner(fn, options);
-    const dbInfo = options.dbInfo === true ? {} : options.dbInfo;
-    return this.bean.database.newDb(() => {
+    if (isNil(options?.dbInfo)) return this._newCtxInner(fn, options);
+    return this.bean.database.switchDb(() => {
       return this._newCtxInner(fn, options);
-    }, dbInfo);
+    }, options?.dbInfo);
   }
   async _newCtxInner(fn, options) {
     options = Object.assign({}, options);
@@ -139,8 +140,8 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
       } else {
         res = await fn();
       }
-      // commitDone
-      await ctx.commitDone();
+      // commitsDone
+      await ctx.commitsDone();
       // ok
       return res;
     });
@@ -229,14 +230,14 @@ let ServiceExecutor = (_dec$1 = Service(), _dec2$1 = BeanInfo({
     const clientName = options?.dbInfo?.clientName ?? current?.clientName;
     const locale = options?.locale === undefined ? this.ctx?.locale : options.locale;
     const instanceName = options?.instanceName === undefined ? this.ctx?.instanceName : options.instanceName;
-    options = {
+    options = Object.assign({}, options, {
       dbInfo: {
         level,
         clientName
       },
       locale,
       instanceName
-    };
+    });
     if (this.ctx) {
       options = deepExtend({
         extraData: {

package/dist/types/executor.d.ts

@@ -1,6 +1,6 @@
 import type { ContextState, IInstanceRecord, ILocaleInfos, PowerPartial } from 'vona';
-import type { IDbInfo, ITransactionOptions } from 'vona-module-a-database';
 import type { ConfigOnions } from 'vona-module-a-onion';
+import type { IDbInfo, ITransactionOptions } from 'vona-module-a-orm';
 export declare const SymbolRouterMiddleware: unique symbol;
 export interface INewCtxExtraData {
     state?: ContextState;
@@ -9,7 +9,7 @@ export interface INewCtxExtraData {
     };
 }
 export interface INewCtxOptions extends INewCtxBaseOptions {
-    dbInfo?: IDbInfo | true;
+    dbInfo?: Partial<IDbInfo>;
 }
 export interface INewCtxBaseOptions {
     locale?: keyof ILocaleInfos;

package/package.json

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